From c7092288b30cc05cc7152e7c83ba326dbe3004ec Mon Sep 17 00:00:00 2001
From: Tobias Bruns <tobias.bruns@mgm-tp.com>
Date: Fri, 3 Jan 2025 13:30:21 +0100
Subject: [PATCH] reorder build to keep things running
---
Jenkinsfile | 35 ++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index e43ba8c7..5bba8d66 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -106,26 +106,10 @@ pipeline {
}
}
- stage ('Deploy SBOM to DependencyTrack') {
- steps {
- script {
- IMAGE_TAG = buildVersionName()
-
- configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
- withCredentials([string(credentialsId: 'dependency-track-api-key', variable: 'API_KEY')]) {
-
- 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"
- }
- }
- }
- }
- }
- }
-
stage('Build and publish Docker image') {
steps {
script {
+ IMAGE_TAG = buildVersionName()
FAILED_STAGE=env.STAGE_NAME
}
@@ -189,6 +173,23 @@ pipeline {
}
}
}
+
+ stage ('Deploy SBOM to DependencyTrack') {
+ steps {
+ script {
+ IMAGE_TAG = buildVersionName()
+
+ configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+ withCredentials([string(credentialsId: 'dependency-track-api-key', variable: 'API_KEY')]) {
+
+ 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"
+ }
+ }
+ }
+ }
+ }
+ }
}
post {
--
GitLab