diff --git a/Jenkinsfile b/Jenkinsfile index e43ba8c76af10922d1187684d5918787d207b504..5bba8d664eab0976ccbc520d72bfee82a32433b7 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 {