[kvm] Fix KVM results archival (sonic-net#150)

Signed-off-by: Danny Allen <daall@microsoft.com>
xumia · Aug 14, 2020 · a9c9022 · a9c9022
1 parent bcfc3c0
commit a9c9022
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/jenkins/mgmt/sonic-mgmt-canary/Jenkinsfile b/jenkins/mgmt/sonic-mgmt-canary/Jenkinsfile
@@ -39,7 +39,7 @@ pipeline {
 
             post {
                 always {
-                    junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/logs/**/tr.xml')
+                    junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/logs/**/*.xml')
                     archiveArtifacts(artifacts: 'sonic-mgmt/tests/logs/**')
                 }
 

diff --git a/jenkins/mgmt/sonic-mgmt-pr/Jenkinsfile b/jenkins/mgmt/sonic-mgmt-pr/Jenkinsfile
@@ -36,7 +36,7 @@ pipeline {
 
             post {
                 always {
-                    junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/logs/**/tr.xml')
+                    junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/logs/**/*.xml')
                     archiveArtifacts(artifacts: 'sonic-mgmt/tests/logs/**')
                 }
 

diff --git a/jenkins/vs/buildimage-vs-image-201911-test/Jenkinsfile b/jenkins/vs/buildimage-vs-image-201911-test/Jenkinsfile
@@ -63,7 +63,7 @@ pipeline {
 
             post {
                 always {
-                    junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/logs/**/tr.xml')
+                    junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/logs/**/*.xml')
                     archiveArtifacts(artifacts: 'sonic-mgmt/tests/logs/**')
                 }
 

diff --git a/jenkins/vs/buildimage-vs-image-pr/Jenkinsfile b/jenkins/vs/buildimage-vs-image-pr/Jenkinsfile
@@ -86,8 +86,8 @@ sudo cp ../target/sonic-vs.bin /nfs/jenkins/sonic-vs-${JOB_NAME##*/}.${BUILD_NUM
 
             post {
                 always {
-                    junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/logs/**/tr.xml')
-                    archiveArtifacts(artifacts: 'sonic-mgmt/tests/logs/**')
+                    junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/logs/**/*.xml')
+                    archiveArtifacts(artifacts: 'target/**, sonic-mgmt/tests/logs/**')
                 }
 
                 failure {

diff --git a/jenkins/vs/buildimage-vs-image/Jenkinsfile b/jenkins/vs/buildimage-vs-image/Jenkinsfile
@@ -100,8 +100,8 @@ sudo cp ../target/sonic-vs-dbg.bin /nfs/jenkins/sonic-vs-dbg-${JOB_NAME##*/}.${B
 
             post {
                 always {
-                    junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/logs/**/tr.xml')
-                    archiveArtifacts(artifacts: 'sonic-mgmt/tests/logs/**')
+                    junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/logs/**/*.xml')
+                    archiveArtifacts(artifacts: 'target/**, sonic-mgmt/tests/logs/**')
                 }
 
                 failure {

diff --git a/scripts/vs/buildimage-vs-image/runtest.sh b/scripts/vs/buildimage-vs-image/runtest.sh
@@ -33,6 +33,7 @@ PYTEST_CLI_COMMON_OPTS="\
 -l warning \
 -m individual \
 -q 1 \
+-a False \
 -e --disable_loganalyzer"
 
 cd /data/sonic-mgmt/tests