From ba9a8300cff1451be4add886550e9c79952ee7c2 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 14 Aug 2024 14:15:10 +0200
Subject: [PATCH] OZG-6377: Change logic for creating commit hashes: If
master-branch or barrierefreiheit-dev, then add Commit-Hash as suffix
---
Jenkinsfile | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 3fc05e2cbd..836e64d43b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -292,7 +292,7 @@ Void deployHelmChart(String helmChartVersion) {
String generateHelmChartVersion() {
def chartVersion = "${VERSION}"
- if (isMasterBranch()) {
+ if (shouldAppendCommitHash()) {
chartVersion += "-${env.GIT_COMMIT.take(7)}"
}
else if (!isReleaseBranch()) {
@@ -314,7 +314,7 @@ Void tagAndPushDockerImage(String newTag){
String generateImageTag() {
def imageTag = "${env.BRANCH_NAME}-${VERSION}"
- if (isMasterBranch()) {
+ if (shouldAppendCommitHash()) {
imageTag += "-${env.GIT_COMMIT.take(7)}"
}
@@ -415,6 +415,10 @@ Boolean hasValuesFileChanged(String envFile) {
return sh (script: "git status | grep '${envFile}'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
}
+Boolean shouldAppendCommitHash(){
+ return isMasterBranch() || isBarrierefreiheitBranch();
+}
+
Boolean isReleaseBranch() {
return env.BRANCH_NAME == 'release'
}
@@ -423,6 +427,10 @@ Boolean isMasterBranch() {
return env.BRANCH_NAME == 'master'
}
+Boolean isBarrierefreiheitBranch() {
+ return env.BRANCH_NAME == 'barrierefreiheit-dev'
+}
+
Boolean isReleaseVersion(List versions) {
return matchRegexVersion(versions, RELEASE_REGEX)
}
--
GitLab