Skip to content

O
OpenXG-RAN
Commit 99c620b8 authored by Jaroslava Fiedlerova's avatar Jaroslava Fiedlerova
Browse files
Options

Minor modification of tagging develop images on OC

parent aac2a062
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
ci-scripts/cls_cluster.py
View file @ 99c620b8
...@@ -273,6 +273,7 @@ class Cluster: ...@@ -273,6 +273,7 @@ class Cluster:
forceBaseImageBuild = True forceBaseImageBuild = True
baseTag = 'ci-temp' baseTag = 'ci-temp'
else: else:
imageTag = f'develop-{self.ranCommitID[0:8]}'
forceBaseImageBuild = True forceBaseImageBuild = True
# logging to OC Cluster and then switch to corresponding project # logging to OC Cluster and then switch to corresponding project
......
ci-scripts/cls_physim1.py
View file @ 99c620b8
...@@ -114,7 +114,7 @@ class PhySim: ...@@ -114,7 +114,7 @@ class PhySim:
logging.debug('Merging with the target branch: ' + self.ranTargetBranch) logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30) mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)
else: else:
imageTag = "develop" imageTag = f'develop-{self.ranCommitID[0:8]}'
# logging to OC Cluster and then switch to corresponding project # 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) mySSH.command(f'oc login -u {ocUserName} -p {ocPassword} --server https://api.oai.cs.eurecom.fr:6443', '\$', 30)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment