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

daall · web-flow · commit a9c902284dc2 · 2020-08-14T14:20:04.000-07:00
Signed-off-by: Danny Allen &lt;daall@microsoft.com&gt;
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

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ pipeline {`
`39`	`39`
`40`	`40`	`post {`
`41`	`41`	`always {`
`42`		`- junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/logs/**/tr.xml')`
	`42`	`+ junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/logs/*/.xml')`
`43`	`43`	`archiveArtifacts(artifacts: 'sonic-mgmt/tests/logs/**')`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ pipeline {`
`36`	`36`
`37`	`37`	`post {`
`38`	`38`	`always {`
`39`		`- junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/logs/**/tr.xml')`
	`39`	`+ junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/logs/*/.xml')`
`40`	`40`	`archiveArtifacts(artifacts: 'sonic-mgmt/tests/logs/**')`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ pipeline {`
`63`	`63`
`64`	`64`	`post {`
`65`	`65`	`always {`
`66`		`- junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/logs/**/tr.xml')`
	`66`	`+ junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/logs/*/.xml')`
`67`	`67`	`archiveArtifacts(artifacts: 'sonic-mgmt/tests/logs/**')`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -86,8 +86,8 @@ sudo cp ../target/sonic-vs.bin /nfs/jenkins/sonic-vs-${JOB_NAME##*/}.${BUILD_NUM`
`86`	`86`
`87`	`87`	`post {`
`88`	`88`	`always {`
`89`		`- junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/logs/**/tr.xml')`
`90`		`- archiveArtifacts(artifacts: 'sonic-mgmt/tests/logs/**')`
	`89`	`+ junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/logs/*/.xml')`
	`90`	`+ archiveArtifacts(artifacts: 'target/, sonic-mgmt/tests/logs/')`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`failure {`
Original file line number	Diff line number	Diff line change
`@@ -100,8 +100,8 @@ sudo cp ../target/sonic-vs-dbg.bin /nfs/jenkins/sonic-vs-dbg-${JOB_NAME##*/}.${B`
`100`	`100`
`101`	`101`	`post {`
`102`	`102`	`always {`
`103`		`- junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/logs/**/tr.xml')`
`104`		`- archiveArtifacts(artifacts: 'sonic-mgmt/tests/logs/**')`
	`103`	`+ junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/logs/*/.xml')`
	`104`	`+ archiveArtifacts(artifacts: 'target/, sonic-mgmt/tests/logs/')`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`failure {`