From ec6e32f3e5222286b1a5d86b1a7071d2c14a7b81 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Thu, 14 Sep 2023 12:11:28 +0200 Subject: [PATCH] fix(ci): allowing the branch name to be in contributorName/branchName format Signed-off-by: Raphael Defosseux --- ci-scripts/cls_cluster.py | 3 ++- ci-scripts/cls_containerize.py | 4 +++- ci-scripts/cls_physim1.py | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ci-scripts/cls_cluster.py b/ci-scripts/cls_cluster.py index d4d9601d17..d8b1835ca8 100644 --- a/ci-scripts/cls_cluster.py +++ b/ci-scripts/cls_cluster.py @@ -266,7 +266,8 @@ class Cluster: baseTag = 'develop' forceBaseImageBuild = False if self.ranAllowMerge: # merging MR branch into develop -> temporary image - imageTag = f'{self.ranBranch}-{self.ranCommitID[0:8]}' + branchName = self.ranBranch.replace('/','-') + imageTag = f'{branchName}-{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.rhel9 | grep --colour=never -i INDEX') result = re.search('index', ret.stdout) diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py index dc4be1f93b..fa7b2d337b 100644 --- a/ci-scripts/cls_containerize.py +++ b/ci-scripts/cls_containerize.py @@ -97,7 +97,9 @@ def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTarge def ImageTagToUse(imageName, ranCommitID, ranBranch, ranAllowMerge): shortCommit = ranCommitID[0:8] if ranAllowMerge: - tagToUse = f'{ranBranch}-{shortCommit}' + # Allowing contributor to have a name/branchName format + branchName = ranBranch.replace('/','-') + tagToUse = f'{branchName}-{shortCommit}' else: tagToUse = f'develop-{shortCommit}' fullTag = f'{imageName}:{tagToUse}' diff --git a/ci-scripts/cls_physim1.py b/ci-scripts/cls_physim1.py index 2306db513f..b0c9012d7d 100644 --- a/ci-scripts/cls_physim1.py +++ b/ci-scripts/cls_physim1.py @@ -106,7 +106,8 @@ class PhySim: if self.ranCommitID != '': mySSH.command('git checkout -f ' + self.ranCommitID, '\$', 30) if self.ranAllowMerge: - imageTag = f'{self.ranBranch}-{self.ranCommitID[0:8]}' + branchName = self.ranBranch.replace('/','-') + imageTag = f'{branchName}-{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)