From 207a25161dc3bb1598e0e629e9acbe8dfe323fac Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 28 Nov 2024 11:54:05 +0100
Subject: [PATCH] OZG-6923 update imageTag/helmVersion in jenkinsfile
---
Jenkinsfile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b95ab3ce63..dcb6b22ae9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -329,7 +329,7 @@ Void deployHelmChart(String helmChartVersion, String app ) {
}
}
-def validateBranchName(branchName) {
+String validateBranchName(branchName) {
int maxLength = 30
if (branchName.length() > maxLength) {
String originalBranchName = branchName
@@ -343,13 +343,13 @@ def validateBranchName(branchName) {
String buildVersionName() {
if (isReleaseBranch()) {
- return getRootPomVersion(pomFile)
+ return getRootPomVersion()
}
if (isBarrierefreiheitBranch()) {
- return "${getRootPomVersion(pomFile)}-barrierefreiheit${validateBranchName(env.BRANCH_NAME)}${getCommitHash()}".replaceAll("_", "-")
+ return "${getRootPomVersion()}-barrierefreiheit${validateBranchName(env.BRANCH_NAME)}${getCommitHash()}".replaceAll("_", "-")
}
- return "${getRootPomVersion(pomFile)}-${validateBranchName(env.BRANCH_NAME)}${getCommitHash()}".replaceAll("_", "-")
+ return "${getRootPomVersion()}-${validateBranchName(env.BRANCH_NAME)}${getCommitHash()}".replaceAll("_", "-")
}
Void tagAndPushDockerImage(String newTag){
--
GitLab