From 99c620b8cc19099cb08d4bac85685c834f55f199 Mon Sep 17 00:00:00 2001 From: Jaroslava Fiedlerova Date: Fri, 21 Apr 2023 10:19:31 +0200 Subject: [PATCH 1/2] Minor modification of tagging develop images on OC --- ci-scripts/cls_cluster.py | 1 + ci-scripts/cls_physim1.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ci-scripts/cls_cluster.py b/ci-scripts/cls_cluster.py index 9e0988c323..e3a8611c14 100644 --- a/ci-scripts/cls_cluster.py +++ b/ci-scripts/cls_cluster.py @@ -273,6 +273,7 @@ class Cluster: forceBaseImageBuild = True baseTag = 'ci-temp' else: + imageTag = f'develop-{self.ranCommitID[0:8]}' forceBaseImageBuild = True # logging to OC Cluster and then switch to corresponding project diff --git a/ci-scripts/cls_physim1.py b/ci-scripts/cls_physim1.py index 0a45f945a2..2306db513f 100644 --- a/ci-scripts/cls_physim1.py +++ b/ci-scripts/cls_physim1.py @@ -114,7 +114,7 @@ class PhySim: logging.debug('Merging with the target branch: ' + self.ranTargetBranch) mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30) else: - imageTag = "develop" + imageTag = f'develop-{self.ranCommitID[0:8]}' # logging to OC Cluster and then switch to corresponding project mySSH.command(f'oc login -u {ocUserName} -p {ocPassword} --server https://api.oai.cs.eurecom.fr:6443', '\$', 30) From 64b4fbe7f250ea8c87f662fff84a573642dee82c Mon Sep 17 00:00:00 2001 From: Jaroslava Fiedlerova Date: Fri, 21 Apr 2023 13:46:50 +0200 Subject: [PATCH 2/2] Removal of unnecessary line --- ci-scripts/cls_cluster.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ci-scripts/cls_cluster.py b/ci-scripts/cls_cluster.py index e3a8611c14..360a048945 100644 --- a/ci-scripts/cls_cluster.py +++ b/ci-scripts/cls_cluster.py @@ -263,7 +263,6 @@ class Cluster: baseTag = 'develop' forceBaseImageBuild = False - imageTag = 'develop' if self.ranAllowMerge: # merging MR branch into develop -> temporary image imageTag = f'{self.ranBranch}-{self.ranCommitID[0:8]}' if self.ranTargetBranch == 'develop':