From 711e964bcc6139d4b172961c353e8f4f7dac3089 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 15 Aug 2024 15:25:37 +0200
Subject: [PATCH] OZG-6377: Latest bugfixes on image/chart-tags
---
Jenkinsfile | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 836e64d43b..2b3dc142a0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -292,8 +292,11 @@ Void deployHelmChart(String helmChartVersion) {
String generateHelmChartVersion() {
def chartVersion = "${VERSION}"
- if (shouldAppendCommitHash()) {
- chartVersion += "-${env.GIT_COMMIT.take(7)}"
+ if (isMasterBranch()) {
+ chartVersion += getCommitHash()
+ }
+ else if (isBarrierefreiheitBranch()) {
+ chartVersion += "-barrierefreiheit${getCommitHash()}"
}
else if (!isReleaseBranch()) {
chartVersion += "-${env.BRANCH_NAME}"
@@ -314,8 +317,8 @@ Void tagAndPushDockerImage(String newTag){
String generateImageTag() {
def imageTag = "${env.BRANCH_NAME}-${VERSION}"
- if (shouldAppendCommitHash()) {
- imageTag += "-${env.GIT_COMMIT.take(7)}"
+ if (isMasterBranch() || isBarrierefreiheitBranch()) {
+ imageTag += getCommitHash()
}
return imageTag
@@ -411,12 +414,12 @@ Void setNewGitopsVersion(String envFile, String commitMessage) {
}
}
-Boolean hasValuesFileChanged(String envFile) {
- return sh (script: "git status | grep '${envFile}'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
+String getCommitHash() {
+ return "-${env.GIT_COMMIT.take(7)}";
}
-Boolean shouldAppendCommitHash(){
- return isMasterBranch() || isBarrierefreiheitBranch();
+Boolean hasValuesFileChanged(String envFile) {
+ return sh (script: "git status | grep '${envFile}'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
}
Boolean isReleaseBranch() {
--
GitLab