From 201bc410fdea2ff37f852a2417d928a1b1fce3e2 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 27 Aug 2024 07:48:35 +0200
Subject: [PATCH] OZG-4833 dependency track with catchError
---
Jenkinsfile | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 88c96aa..5fa7ffc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -177,12 +177,16 @@ pipeline {
stage ('Deploy SBOM to DependencyTrack') {
steps {
- configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
- withCredentials([string(credentialsId: 'dependency-track-api-key', variable: 'API_KEY')]) {
+ script {
+ IMAGE_TAG = generateImageTag()
- dir('bayernid-proxy-impl') {
- catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
- sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS io.github.pmckeown:dependency-track-maven-plugin:upload-bom -Ddependency-track.apiKey=$API_KEY -Ddependency-track.projectVersion=' + generateImageTag('pom.xml') + ' -Ddependency-track.dependencyTrackBaseUrl=https://dependency-track.ozg-sh.de'
+ configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+ withCredentials([string(credentialsId: 'dependency-track-api-key', variable: 'API_KEY')]) {
+
+ dir('bayernid-proxy-impl') {
+ catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
+ sh "mvn --no-transfer-progress -s $MAVEN_SETTINGS io.github.pmckeown:dependency-track-maven-plugin:upload-bom -Ddependency-track.apiKey=$API_KEY -Ddependency-track.projectVersion=${IMAGE_TAG} -Ddependency-track.dependencyTrackBaseUrl=https://dependency-track.ozg-sh.de"
+ }
}
}
}
--
GitLab