From cf183f434993186838fd0e2277d7ea62def3e541 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Thu, 8 Feb 2024 16:01:10 +0100 Subject: [PATCH] chore(ci): force rebuild of ran-base for integration branches Signed-off-by: Raphael Defosseux --- ci-scripts/cls_cluster.py | 5 +++++ ci-scripts/cls_containerize.py | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ci-scripts/cls_cluster.py b/ci-scripts/cls_cluster.py index 0491c09f73..c8b0ce818b 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 d5de5b70c5..708c2a6f3c 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