From 941acb2e8d886e03bfc31fa2db698f776a796d6b Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Thu, 15 Dec 2022 13:43:16 +0100 Subject: [PATCH] Tag cluster images with branch and commit ID --- ci-scripts/cls_cluster.py | 2 +- ci-scripts/cls_physim1.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-scripts/cls_cluster.py b/ci-scripts/cls_cluster.py index 892d9e847e..c42d112ceb 100644 --- a/ci-scripts/cls_cluster.py +++ b/ci-scripts/cls_cluster.py @@ -214,7 +214,7 @@ class Cluster: forceBaseImageBuild = False imageTag = 'develop' if self.ranAllowMerge: # merging MR branch into develop -> temporary image - imageTag = 'ci-temp' + imageTag = f'{self.ranBranch}-{self.ranCommitID[0:8]}' if self.ranTargetBranch == 'develop': ret = self.cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base.rhel8.2 | grep --colour=never -i INDEX') result = re.search('index', ret.stdout) diff --git a/ci-scripts/cls_physim1.py b/ci-scripts/cls_physim1.py index 5bb64d250c..775eeb5405 100644 --- a/ci-scripts/cls_physim1.py +++ b/ci-scripts/cls_physim1.py @@ -105,7 +105,7 @@ class PhySim: if self.ranCommitID != '': mySSH.command('git checkout -f ' + self.ranCommitID, '\$', 30) if self.ranAllowMerge: - imageTag = "ci-temp" + imageTag = f'{self.ranBranch}-{self.ranCommitID[0:8]}' if self.ranTargetBranch == '': if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'): mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 30)