From 96d63004b19d5072065c7b67e1062b7e97e5aae2 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 4 Jul 2024 18:13:46 +0200
Subject: [PATCH] OZG-5907 update branch jar name schema in jenkinsfile
---
Jenkinsfile | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 24e34f4..781fb2c 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"
--
GitLab