diff --git a/Jenkinsfile b/Jenkinsfile index 24e34f4f26ee68caf79a6be3d94b0c5358739500..781fb2c325d62a32da7db74b8f93403ccbb95a99 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,10 +44,18 @@ pipeline { } stage('Set Version') { + when { + not { + anyOf { + branch 'master' + branch 'release' + } + } + } steps { script { FAILED_STAGE=env.STAGE_NAME - JAR_TAG = generateImageTag('pom.xml') + JAR_TAG = generateBranchPRJarTag('pom.xml') } configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { sh "mvn -s $MAVEN_SETTINGS versions:set -DnewVersion=${JAR_TAG} -DprocessAllModules=true" @@ -281,6 +289,13 @@ String generateImageTag(String pomFile) { return imageTag } +String generateBranchPRJarTag(String pomFile) { + def (version, snapshot) = getPomVersion(pomFile).split('-') + def jarTag = "${version}-${env.BRANCH_NAME}-${snapshot}" + + return jarTag +} + Void configureGit() { final email = "jenkins@ozg-sh.de" final name = "jenkins"