From 7fa65db041ffe5a270fa95074bcbe9a6661d99df Mon Sep 17 00:00:00 2001
From: zhenzhen <zhenzhen.liu@mgm-tp.com>
Date: Fri, 15 Nov 2024 17:41:03 +0100
Subject: [PATCH] update jenkinsfile and pom
---
Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 460380a..ecaa19d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -77,7 +77,7 @@ pipeline {
FAILED_STAGE = env.STAGE_NAME
}
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
- sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS -DskipTests deploy -Dmaven.wagon.http.retryHandler.count=3'
+ sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS -P nexus-deploy -DskipTests deploy -Dmaven.wagon.http.retryHandler.count=3'
sh "mvn -s $MAVEN_SETTINGS versions:revert"
}
}
@@ -293,7 +293,7 @@ Void tagAndPushDockerImage(String newTag){
withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
sh 'docker login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}'
- sh "docker tag docker.ozg-sh.de/xta-test-server:build-latest docker.ozg-sh.de/xta-test-server:${newTag}"
+ sh "docker tag docker.ozg-sh.de/xta-test-server:${getPomVersion('pom.xml')} docker.ozg-sh.de/xta-test-server:${newTag}"
sh "docker push docker.ozg-sh.de/xta-test-server:${newTag}"
}
}
--
GitLab