Merge pull request 'OZG-6923 add commitId to feature branch image tag/helm...

Merge pull request 'OZG-6923 add commitId to feature branch image tag/helm version' (#16) from OZG-6923 into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/antragraum-proxy/pulls/16


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

Jenkinsfile

@@ -119,7 +119,7 @@ tools { go 'go-1.22.0' }
                 
                    sh "docker build -t docker.ozg-sh.de/antragraum-proxy:${env.APP_VERSION} ."
 
-                    IMAGE_TAG = generateImageTag()
+                    IMAGE_TAG = buildVersionName()
 
                     tagAndPushDockerImage('antragraum-proxy', IMAGE_TAG)
 
@@ -137,7 +137,7 @@ tools { go 'go-1.22.0' }
             steps {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
-                    HELM_CHART_VERSION = generateHelmChartVersion()
+                    HELM_CHART_VERSION = buildVersionName()
 
                     sh "./run_helm_test.sh"
 
@@ -207,8 +207,22 @@ String getHelmRepository(){
     return 'ozg-base-apps-snapshot';
 }
 
-String generateImageTag() {
-    return "${env.APP_VERSION}-${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
+}
+
+String buildVersionName() {
+    if (isReleaseBranch()) {
+        return env.APP_VERSION
+    }
+    return "${env.APP_VERSION}-${validateBranchName(env.BRANCH_NAME)}-${env.GIT_COMMIT.take(7)}".replaceAll("_", "-")
 }
 
 
@@ -327,18 +341,6 @@ Boolean isReleaseBranch() {
     return env.BRANCH_NAME == 'release'
 }
 
-String generateHelmChartVersion() {
-    def chartVersion = "${env.APP_VERSION}" 
-
-    if (isMasterBranch()) {
-        chartVersion += "-${env.GIT_COMMIT.take(7)}"
-    }
-    else if (!isReleaseBranch()) {
-        chartVersion += "-${env.BRANCH_NAME}"
-    }
-
-    return chartVersion.replaceAll("_", "-")
-}
 Void tagAndPushDockerImage(String imageName, String newTag){
     withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
         sh 'docker login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}'