Meridio: Archive all in _output and increase timeout

Change-Id: I882d8adb8e67f6f3aaa489516763706cc375cb5d

diff --git a/jjb/nsm/Jenkinsfile.security-scan b/jjb/nsm/Jenkinsfile.security-scan
index 655c6d44c4c304e3f7633a0d84e54df3fb6ddf05..ca9997b3eb01a0a686d8d6fe399c07f1604814c6 100644 (file)
--- a/jjb/nsm/Jenkinsfile.security-scan
+++ b/jjb/nsm/Jenkinsfile.security-scan
@@ -61,7 +61,10 @@ node('nordix-nsm-build-ubuntu2204') {
             }
             stage('Report') {
                 if (env.DRY_RUN != 'true') {
-                    archiveArtifacts artifacts: '_output/*', followSymlinks: false
+                    try {
+                        archiveArtifacts artifacts: '_output/**/*.*', followSymlinks: false
+                    } catch (Exception e) {
+                    }
 
                     def number_of_vulnerabilities =  sh(script: 'cat _output/list.txt | grep -v "^$" | awk \'{print $1}\' | sort | uniq | wc -l', returnStdout: true).trim()
                     def list_of_vulnerabilities =  sh(script: 'cat _output/list.txt | grep -v "^$" | awk \'{print $1}\' | sort | uniq | sed \':a;N;$!ba;s/\\n/ ; /g\'', returnStdout: true).trim()

diff --git a/jjb/nsm/e2e.Jenkinsfile b/jjb/nsm/e2e.Jenkinsfile
index d38d88f2140de2ced112578f929cb141c4254a0d..7ff13bb9cbe070bb466b5a8ebda297fe81f6f48b 100644 (file)
--- a/jjb/nsm/e2e.Jenkinsfile
+++ b/jjb/nsm/e2e.Jenkinsfile
@@ -49,7 +49,7 @@ node('nordix-nsm-build-ubuntu2204') {
             ])
             sh 'git show'
         }
-        timeout(60) {
+        timeout(120) {
             stage('Environment') {
                 currentBuild.description = "Meridio version: $meridio_version / TAPA version: $tapa_version / NSM version: $nsm_version / IP Family: $ip_family / Kubernetes version: $kubernetes_version / Current Branch: $current_branch / Seed: $seed"
 
@@ -194,7 +194,7 @@ def Report() {
         ReportKubernetes(success, failure).call()
 
         try {
-            archiveArtifacts artifacts: '_output/*', followSymlinks: false
+            archiveArtifacts artifacts: '_output/**/*.*', followSymlinks: false
         } catch (Exception e) {
         }
     }