Skip to content
Snippets Groups Projects
Commit 20bd227d authored by Martin's avatar Martin
Browse files

OZG-7121 fix JenkinsFile

parent 68e6689d
No related branches found
No related tags found
1 merge request!3Resolve "xta-test-server helm-chart mit Deployment und Keystore-Secrets/Certificate-Resources"
Pipeline #1143 failed
...@@ -24,7 +24,7 @@ pipeline { ...@@ -24,7 +24,7 @@ pipeline {
steps { steps {
script { script {
FAILED_STAGE = env.STAGE_NAME FAILED_STAGE = env.STAGE_NAME
def rootVersion = getPomVersion('pom.xml') def rootVersion = getPomVersion()
if(isReleaseBranch()){ if(isReleaseBranch()){
if ( !(rootVersion ==~ RELEASE_REGEX)) { if ( !(rootVersion ==~ RELEASE_REGEX)) {
...@@ -50,7 +50,7 @@ pipeline { ...@@ -50,7 +50,7 @@ pipeline {
steps { steps {
script { script {
FAILED_STAGE=env.STAGE_NAME FAILED_STAGE=env.STAGE_NAME
JAR_TAG = getPomVersion('pom.xml').replace("SNAPSHOT", "${env.BRANCH_NAME}-SNAPSHOT") JAR_TAG = getPomVersion().replace("SNAPSHOT", "${env.BRANCH_NAME}-SNAPSHOT")
} }
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
sh "mvn -s $MAVEN_SETTINGS versions:set -DnewVersion=${JAR_TAG} -DprocessAllModules=true" sh "mvn -s $MAVEN_SETTINGS versions:set -DnewVersion=${JAR_TAG} -DprocessAllModules=true"
...@@ -167,7 +167,7 @@ pipeline { ...@@ -167,7 +167,7 @@ pipeline {
stage ('Deploy SBOM to DependencyTrack') { stage ('Deploy SBOM to DependencyTrack') {
steps { steps {
script { script {
IMAGE_TAG = buildVersionName('pom.xml') IMAGE_TAG = buildVersionName()
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
withCredentials([string(credentialsId: 'dependency-track-api-key', variable: 'API_KEY')]) { withCredentials([string(credentialsId: 'dependency-track-api-key', variable: 'API_KEY')]) {
...@@ -222,8 +222,8 @@ Boolean isReleaseBranch() { ...@@ -222,8 +222,8 @@ Boolean isReleaseBranch() {
return env.BRANCH_NAME == 'release' return env.BRANCH_NAME == 'release'
} }
String getPomVersion(String pomFile){ String getPomVersion(){
def pom = readMavenPom file: pomFile def pom = readMavenPom file: 'pom.xml'
return pom.version return pom.version
} }
...@@ -277,18 +277,18 @@ Void loginToDockerRepo() { ...@@ -277,18 +277,18 @@ Void loginToDockerRepo() {
} }
String buildVersionName(String pomFile) { String buildVersionName() {
if (isReleaseBranch()) { if (isReleaseBranch()) {
return getPomVersion(pomFile) return getPomVersion()
} }
return "${getPomVersion(pomFile)}-${env.BRANCH_NAME}-${env.GIT_COMMIT.take(7)}".replaceAll("_", "-") return "${getPomVersion()}-${env.BRANCH_NAME}-${env.GIT_COMMIT.take(7)}".replaceAll("_", "-")
} }
Void tagAndPushDockerImage(String newTag){ Void tagAndPushDockerImage(String newTag){
withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) { withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
sh 'docker login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}' sh 'docker login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}'
sh "docker tag docker.ozg-sh.de/xta-test-server:${getPomVersion('pom.xml')} docker.ozg-sh.de/xta-test-server:${newTag}" sh "docker tag docker.ozg-sh.de/xta-test-server:${getPomVersion()} docker.ozg-sh.de/xta-test-server:${newTag}"
sh "docker push docker.ozg-sh.de/xta-test-server:${newTag}" sh "docker push docker.ozg-sh.de/xta-test-server:${newTag}"
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment