From d6d4063fde27b0a131947a2b897b41928f53ece3 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 28 Nov 2024 14:06:09 +0100
Subject: [PATCH] OZG-6923 add commitId to feature branch image tag/helm
version
---
Jenkinsfile | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 5a61e4e5..3a22ec8c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -130,7 +130,7 @@ pipeline {
stage ('Deploy SBOM to DependencyTrack') {
steps {
script {
- IMAGE_TAG = generateImageTag()
+ IMAGE_TAG = buildVersionName()
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
withCredentials([string(credentialsId: 'dependency-track-api-key', variable: 'API_KEY')]) {
@@ -175,7 +175,7 @@ pipeline {
steps {
script {
FAILED_STAGE = env.STAGE_NAME
- IMAGE_TAG = generateImageTag()
+ IMAGE_TAG = buildVersionName()
tagAndPushDockerImage(IMAGE_TAG)
@@ -193,7 +193,7 @@ pipeline {
steps {
script {
FAILED_STAGE=env.STAGE_NAME
- HELM_CHART_VERSION = generateHelmChartVersion()
+ HELM_CHART_VERSION = buildVersionName()
sh "./run_helm_test.sh"
@@ -307,17 +307,22 @@ Void deployHelmChart(String helmChartVersion) {
}
}
-String generateHelmChartVersion() {
- def chartVersion = getPomVersion('pom.xml')
-
- if (env.BRANCH_NAME == 'master') {
- chartVersion += "-${env.GIT_COMMIT.take(7)}"
- }
- else if (env.BRANCH_NAME != 'release') {
- 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 buildVersionName() {
+ if (env.BRANCH_NAME == 'release') {
+ return getPomVersion('pom.xml')
+ }
+ return "${getPomVersion('pom.xml')}-${validateBranchName(env.BRANCH_NAME)}-${env.GIT_COMMIT.take(7)}".replaceAll("_", "-")
}
Void sendFailureMessage() {
@@ -415,7 +420,7 @@ String getPomVersion(String pomFile){
return pom.version
}
-String generateImageTag() {
+String buildVersionName() {
def imageTag = "${env.BRANCH_NAME}-${getPomVersion('pom.xml')}"
if (env.BRANCH_NAME == 'master') {
--
GitLab