From 84b79bf17a9ae39b97fc476512549d47038e8a6e Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 15 Jan 2024 12:24:37 +0100
Subject: [PATCH] OZG-4765 adjust naming
---
Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 5dac45e24b..33502ea4a2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -261,7 +261,7 @@ String generateHelmChartVersion() {
if (isMasterBranch()) {
chartVersion += "-${env.GIT_COMMIT.take(7)}"
}
- else if (env.BRANCH_NAME != 'release') {
+ else if (!isReleaseBranch()) {
chartVersion += "-${env.BRANCH_NAME}"
}
@@ -278,7 +278,7 @@ Void tagAndPushDockerImage(String newTag){
}
String generateImageTag() {
- def imageTag = "${env.BRANCH_NAME}-${VERSION}"
+ def imageTag = "release-2.0.1";//"${env.BRANCH_NAME}-${VERSION}"
if (isMasterBranch()) {
imageTag += "-${env.GIT_COMMIT.take(7)}"
--
GitLab