update jenkinsfile

Jenkinsfile

@@ -97,7 +97,7 @@ pipeline {
             steps {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
-                    IMAGE_TAG = generateImageTag()
+                    IMAGE_TAG = buildVersionName()
 
                     tagAndPushDockerImage(IMAGE_TAG)
 
@@ -116,7 +116,7 @@ pipeline {
             steps {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
-                    HELM_CHART_VERSION = generateHelmChartVersion()
+                    HELM_CHART_VERSION = buildVersionName()
 
                     sh "./run_helm_test.sh"
                    
@@ -167,7 +167,7 @@ pipeline {
         stage ('Deploy SBOM to DependencyTrack') {
             steps {
                 script {
-                    IMAGE_TAG = "${env.BRANCH_NAME}-${getPomVersion('pom.xml')}"
+                    IMAGE_TAG = buildVersionName('pom.xml')
 
                     configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
                         withCredentials([string(credentialsId: 'dependency-track-api-key', variable: 'API_KEY')]) {
@@ -276,17 +276,12 @@ Void loginToDockerRepo() {
 
 }
 
-String generateHelmChartVersion() {
-    def chartVersion = getPomVersion('pom.xml')
 
-    if (env.BRANCH_NAME == 'master') {
-        chartVersion += "-${env.GIT_COMMIT.take(7)}"
+String buildVersionName(String pomFile) {
+    if (isReleaseBranch()) {
+        return getPomVersion(pomFile)
     }
-    else if (env.BRANCH_NAME != 'release') {
-        chartVersion += "-${env.BRANCH_NAME}"
-    }
-
-    return chartVersion.replaceAll("_", "-")
+    return "${getPomVersion(pomFile)}-${env.BRANCH_NAME}-${env.GIT_COMMIT.take(7)}".replaceAll("_", "-")
 }
 
 Void tagAndPushDockerImage(String newTag){
@@ -298,16 +293,6 @@ Void tagAndPushDockerImage(String newTag){
     }
 }
 
-String generateImageTag() {
-    def imageTag = "${env.BRANCH_NAME}-${getPomVersion('pom.xml')}"
-
-    if (env.BRANCH_NAME == 'master') {
-        imageTag += "-${env.GIT_COMMIT.take(7)}"
-    }
-
-    return imageTag
-}
-
 Void configureGit() {
     final email = "jenkins@ozg-sh.de"
     final name = "jenkins"