From 00f9e98c7b8e46cb0efd203145eb42684e33726a Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 25 Sep 2024 11:42:39 +0200
Subject: [PATCH] OZG-6710 [chore] fix Jenkinsfile
---
Jenkinsfile | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index ceae955d..5e879676 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,7 +33,7 @@ pipeline {
def rootVersion = getRootPomVersion()
def zufiManagerServerVersion = getParentPomVersion('zufi-manager-server/pom.xml')
def zufiManagerPvogVersion = getParentPomVersion('zufi-manager-pvog/pom.xml')
- def zufiManagerInterfaceVersion = getParentPomVersion('zufi-manager-interface/pom.xml')
+ def zufiManagerInterfaceVersion = getPomVersion('zufi-manager-interface/pom.xml')
def zufiManagerModelVersion = getParentPomVersion('zufi-manager-model/pom.xml')
if (isReleaseBranch()) {
@@ -436,8 +436,7 @@ Void performSonarCheck(String module) {
}
String getRootPomVersion() {
- def rootPom = readMavenPom file: 'pom.xml'
- return rootPom.version
+ return getPomVersion('pom.xml')
}
String getParentPomVersion(String filePath) {
@@ -445,6 +444,11 @@ String getParentPomVersion(String filePath) {
return pom.parent.version
}
+String getPomVersion(String pomFile){
+ def pom = readMavenPom file: pomFile
+ return pom.version
+}
+
String generateImageTag() {
def imageTag = "${env.BRANCH_NAME}-${getRootPomVersion()}"
--
GitLab