diff --git a/Jenkinsfile b/Jenkinsfile index ea61820658c4cd45e2b39bc1b5ce7c4d7b93653d..622a586831a0b9a413efe51b7e6d47ab5ce459e1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,6 +12,7 @@ pipeline { SH_SUCCESS_STATUS_CODE = 0 IMAGE_TAG = generateImageTag() HELM_CHART_VERSION = generateHelmChartVersion() + BUILD_TAG = generateBuildTag() } options { @@ -73,12 +74,11 @@ pipeline { steps { script { FAILED_STAGE=env.STAGE_NAME - env.BUILD_TAG = generateBuildTag() } configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) { - sh 'mvn -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3 -Dimagetag=$IMAGE_TAG -Dbuildtag=${env.BUILD_TAG} -Dspring-boot.build-image.publish=true -Duser=${USER} -Dpassword=${PASSWORD}' + sh 'mvn -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3 -Dimagetag=$IMAGE_TAG -Dbuildtag=$BUILD_TAG -Dspring-boot.build-image.publish=true -Duser=${USER} -Dpassword=${PASSWORD}' } } } @@ -161,14 +161,12 @@ String generateImageTag() { String generateBuildTag() { def buildName = "docker.ozg-sh.de/administration" - def buildTag = buildName+":"+IMAGE_TAG + def buildTag = buildName+":"+generateImageTag() if (isMasterBranch()) { buildTag += ","+buildName+":snapshot-latest" } else if (isReleaseBranch()) { buildTag += ","+buildName+":latest" - } else if (env.BRANCH_NAME == 'OZG-4792-FixMasterBranchTagging') { - buildTag += ","+buildName+":doubleTagTest" } return buildTag }