From cce8a9c24890848cf5e1d84a6ae11c7c57703697 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 28 Nov 2024 17:20:39 +0100
Subject: [PATCH] OZG-6923 add commitId to feature branch helm version
---
Jenkinsfile | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 929023b..c467511 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -144,17 +144,22 @@ void deployHelmChart(String helmChartName, String helmChartVersion) {
}
}
-String generateHelmChartBuildVersion() {
- def chartVersion = getHelmChartVersion()
-
- if (isMasterBranch()) {
- chartVersion += "-${env.GIT_COMMIT.take(7)}"
- }
- else if (!isReleaseBranch()) {
- chartVersion += "-${env.BRANCH_NAME}"
+String validateBranchName(branchName) {
+ int maxLength = 30
+ if (branchName.length() > maxLength) {
+ String originalBranchName = branchName
+ branchName = branchName.substring(0, maxLength)
+ echo "WARNING: Branch name '${originalBranchName}' exceeded ${maxLength} characters. " +
+ "It has been truncated to '${branchName}' for deployment purposes."
}
+ return branchName
+}
- return chartVersion.replaceAll("_", "-")
+String generateHelmChartBuildVersion() {
+ if (isReleaseBranch()) {
+ return getHelmChartVersion().replaceAll("_", "-")
+ }
+ return "${getHelmChartVersion()}-${validateBranchName(env.BRANCH_NAME)}-${env.GIT_COMMIT.take(7)}".replaceAll("_", "-")
}
--
GitLab