From 0d735e26e1b97d52290a2a1289bad25ef0cca478 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 15 Nov 2024 15:39:49 +0100
Subject: [PATCH] OZG-6923 update jenkinsfile for imagetag/helmVersion
---
Jenkinsfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index ad8eddbde..b84fa5f53 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -135,9 +135,6 @@ pipeline {
script {
FAILED_STAGE=env.STAGE_NAME
HELM_CHART_VERSION = buildVersionName("pom.xml")
- if (env.BRANCH_NAME == 'release') {
- HELM_CHART_VERSION = getPomVersion(pomFile)
- }
sh "./run_helm_test.sh"
@@ -273,6 +270,9 @@ void deployHelmChart(String helmChartName, String helmChartVersion) {
}
String buildVersionName(String pomFile) {
+ if (isReleaseBranch()) {
+ return getPomVersion(pomFile)
+ }
return "${getPomVersion(pomFile)}-${env.BRANCH_NAME}-${env.GIT_COMMIT.take(7)}".replaceAll("_", "-")
}
--
GitLab