Merge branch 'branches/rudder/8.0'

Normation · Sep 13, 2023 · ceb9089 · ceb9089
2 parents 0fd4bb0 + c8493dd
commit ceb9089
Showing 1 changed file with 25 additions and 5 deletions.
diff --git a/Jenkinsfile-security b/Jenkinsfile-security
@@ -24,6 +24,31 @@ pipeline {
                 }
             }
             steps {
+                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                    dir('plugins-common') {
+                        withMaven(globalMavenSettingsConfig: "1bfa2e1a-afda-4cb4-8568-236c44b94dbf",
+                            // don't archive jars
+                            options: [artifactsPublisher(disabled: true)]
+                        ) {
+                            // we need to use $MVN_COMMAND to get the settings file path
+                            sh script: 'make generate-pom'
+                            sh script: 'mvn --update-snapshots clean install', label: "common deploy"
+                        }
+                    }
+                }
+                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                    dir('plugins-common-private') {
+                        withMaven(globalMavenSettingsConfig: "1bfa2e1a-afda-4cb4-8568-236c44b94dbf",
+                            // don't archive jars
+                            options: [artifactsPublisher(disabled: true)]
+                        ) {
+                            // we need to use $MVN_COMMAND to get the settings file path
+                            sh script: 'make generate-pom'
+                            sh script: 'mvn --update-snapshots install package', label: "private common deploy"
+                        }
+                    }
+                }
+
                 script {
                     SCALA_PLUGINS = sh (
                         script: 'make scala-plugins-list',
@@ -65,11 +90,6 @@ pipeline {
                     }
                 }
             }
-            post {
-                always {
-            		archiveArtifacts artifacts: '*/target/dependency-check-report.html, */target/site/aggregate-third-party-report.html'
-                }
-            }
         }
         stage('End') {
             steps {