diff --git a/ci-scripts/cls_cluster.py b/ci-scripts/cls_cluster.py index 0491c09f73eb1a9a5eef6efac3f209f6eba6f921..c8b0ce818b927100bcf0b08f663451627c88629c 100644 --- a/ci-scripts/cls_cluster.py +++ b/ci-scripts/cls_cluster.py @@ -274,6 +274,11 @@ class Cluster: if result is not None: forceBaseImageBuild = True baseTag = 'ci-temp' + # if the branch name contains integration_20xx_wyy, let rebuild ran-base + result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.ranBranch) + if not forceBaseImageBuild and result is not None: + forceBaseImageBuild = True + baseTag = 'ci-temp' else: imageTag = f'develop-{self.ranCommitID[0:8]}' forceBaseImageBuild = True diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py index d5de5b70c599eb0ac4d410dd7b6c199bfbf74b8e..708c2a6f3c42a7a8bb8729e7f615a960f14b7e50 100644 --- a/ci-scripts/cls_containerize.py +++ b/ci-scripts/cls_containerize.py @@ -419,6 +419,11 @@ class Containerize(): if result is not None: forceBaseImageBuild = True baseTag = 'ci-temp' + # if the branch name contains integration_20xx_wyy, let rebuild ran-base + result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.ranBranch) + if not forceBaseImageBuild and result is not None: + forceBaseImageBuild = True + baseTag = 'ci-temp' else: forceBaseImageBuild = True