Skip to content
Snippets Groups Projects
Commit ba9a8300 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6377: Change logic for creating commit hashes: If master-branch or...

OZG-6377: Change logic for creating commit hashes: If master-branch or barrierefreiheit-dev, then add Commit-Hash as suffix
parent 463b2ba2
Branches
Tags
No related merge requests found
...@@ -292,7 +292,7 @@ Void deployHelmChart(String helmChartVersion) { ...@@ -292,7 +292,7 @@ Void deployHelmChart(String helmChartVersion) {
String generateHelmChartVersion() { String generateHelmChartVersion() {
def chartVersion = "${VERSION}" def chartVersion = "${VERSION}"
if (isMasterBranch()) { if (shouldAppendCommitHash()) {
chartVersion += "-${env.GIT_COMMIT.take(7)}" chartVersion += "-${env.GIT_COMMIT.take(7)}"
} }
else if (!isReleaseBranch()) { else if (!isReleaseBranch()) {
...@@ -314,7 +314,7 @@ Void tagAndPushDockerImage(String newTag){ ...@@ -314,7 +314,7 @@ Void tagAndPushDockerImage(String newTag){
String generateImageTag() { String generateImageTag() {
def imageTag = "${env.BRANCH_NAME}-${VERSION}" def imageTag = "${env.BRANCH_NAME}-${VERSION}"
if (isMasterBranch()) { if (shouldAppendCommitHash()) {
imageTag += "-${env.GIT_COMMIT.take(7)}" imageTag += "-${env.GIT_COMMIT.take(7)}"
} }
...@@ -415,6 +415,10 @@ Boolean hasValuesFileChanged(String envFile) { ...@@ -415,6 +415,10 @@ Boolean hasValuesFileChanged(String envFile) {
return sh (script: "git status | grep '${envFile}'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer return sh (script: "git status | grep '${envFile}'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
} }
Boolean shouldAppendCommitHash(){
return isMasterBranch() || isBarrierefreiheitBranch();
}
Boolean isReleaseBranch() { Boolean isReleaseBranch() {
return env.BRANCH_NAME == 'release' return env.BRANCH_NAME == 'release'
} }
...@@ -423,6 +427,10 @@ Boolean isMasterBranch() { ...@@ -423,6 +427,10 @@ Boolean isMasterBranch() {
return env.BRANCH_NAME == 'master' return env.BRANCH_NAME == 'master'
} }
Boolean isBarrierefreiheitBranch() {
return env.BRANCH_NAME == 'barrierefreiheit-dev'
}
Boolean isReleaseVersion(List versions) { Boolean isReleaseVersion(List versions) {
return matchRegexVersion(versions, RELEASE_REGEX) return matchRegexVersion(versions, RELEASE_REGEX)
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment