Tag cluster images with branch and commit ID

This commit is contained in:
Robert Schmidt
2023-01-11 15:15:06 +01:00
parent 7361c1689e
commit 941acb2e8d
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -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)