[kvmtest] Dump PTF state to docker image after test failure (sonic-net#125)

daall · web-flow · commit 8b55f4164e37 · 2020-06-29T14:32:14.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
@@ -40,7 +40,7 @@ pipeline {
             post {
                 always {
                     junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/results/**/*.xml')
-                    archiveArtifacts(artifacts: 'sonic-mgmt/tests/results/**, sonic-mgmt/tests/logs/**, kvmdump/**')
+                    archiveArtifacts(artifacts: 'sonic-mgmt/tests/results/**, sonic-mgmt/tests/logs/**, kvmdump/**, ptfdump/**')
                 }
             }
         }
diff --git a/jenkins/mgmt/sonic-mgmt-pr/Jenkinsfile b/jenkins/mgmt/sonic-mgmt-pr/Jenkinsfile
@@ -37,7 +37,7 @@ pipeline {
             post {
                 always {
                     junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/results/**/*.xml')
-                    archiveArtifacts(artifacts: 'sonic-mgmt/tests/results/**, sonic-mgmt/tests/logs/**, kvmdump/**')
+                    archiveArtifacts(artifacts: 'sonic-mgmt/tests/results/**, sonic-mgmt/tests/logs/**, kvmdump/**, ptfdump/**')
                 }
             }
         }
diff --git a/jenkins/vs/buildimage-vs-image-201911-test/Jenkinsfile b/jenkins/vs/buildimage-vs-image-201911-test/Jenkinsfile
@@ -68,7 +68,7 @@ pipeline {
 
         always {
             junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/results/**/*.xml')
-            archiveArtifacts(artifacts: 'sonic-mgmt/tests/results/**, sonic-mgmt/tests/logs/**, kvmdump/**')
+            archiveArtifacts(artifacts: 'sonic-mgmt/tests/results/**, sonic-mgmt/tests/logs/**, kvmdump/**, ptfdump/**')
         }
 
         fixed {
diff --git a/jenkins/vs/buildimage-vs-image-pr/Jenkinsfile b/jenkins/vs/buildimage-vs-image-pr/Jenkinsfile
@@ -88,7 +88,7 @@ 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/results/**/*.xml')
-                    archiveArtifacts(artifacts: 'target/**, sonic-mgmt/tests/results/**, sonic-mgmt/tests/logs/**, kvmdump/**')
+                    archiveArtifacts(artifacts: 'target/**, sonic-mgmt/tests/results/**, sonic-mgmt/tests/logs/**, kvmdump/**, ptfdump/**')
                 }
             }
         }
diff --git a/jenkins/vs/buildimage-vs-image-test/Jenkinsfile b/jenkins/vs/buildimage-vs-image-test/Jenkinsfile
@@ -67,7 +67,7 @@ pipeline {
     post {
 
         always {
-            archiveArtifacts(artifacts: 'sonic-mgmt/tests/logs/**, sonic-mgmt/tests/results/**, kvmdump/**')
+            archiveArtifacts(artifacts: 'sonic-mgmt/tests/logs/**, sonic-mgmt/tests/results/**, kvmdump/**, ptfdump/**')
             junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/results/**/*.xml')
         }
 
diff --git a/jenkins/vs/buildimage-vs-image/Jenkinsfile b/jenkins/vs/buildimage-vs-image/Jenkinsfile
@@ -101,7 +101,7 @@ 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/results/**/*.xml')
-                    archiveArtifacts(artifacts: 'target/**, sonic-mgmt/tests/results/**, sonic-mgmt/tests/logs/**, kvmdump/**')
+                    archiveArtifacts(artifacts: 'target/**, sonic-mgmt/tests/results/**, sonic-mgmt/tests/logs/**, kvmdump/**, ptfdump/**')
                 }
             }
 
diff --git a/scripts/vs/buildimage-vs-image/test.sh b/scripts/vs/buildimage-vs-image/test.sh
@@ -7,6 +7,7 @@ virsh -c qemu:///system list
 
 tbname=vms-kvm-t0
 dut=vlab-01
+ptf_name=ptf_vms6-1
 
 docker login -u $REGISTRY_USERNAME -p $REGISTRY_PASSWD sonicdev-microsoft.azurecr.io:443
 docker pull sonicdev-microsoft.azurecr.io:443/docker-sonic-mgmt:latest
@@ -43,5 +44,12 @@ if [ $? != 0 ]; then
         sudo chown -R johnar.johnar kvmdump
         virsh -c qemu:///system undefine $dut
     fi
+
+    rm -rf ptfdump
+    mkdir -p ptfdump
+    docker commit $ptf_name docker-ptf:${JOB_NAME##*/}.${BUILD_NUMBER}
+    docker save docker-ptf:${JOB_NAME##*/}.${BUILD_NUMBER} | gzip -c > ptfdump/docker-ptf-dump.gz
+    docker rmi docker-ptf:${JOB_NAME##*/}.${BUILD_NUMBER}
+
     exit 2
 fi

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ pipeline {`
`40`	`40`	`post {`
`41`	`41`	`always {`
`42`	`42`	`junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/results/*/.xml')`
`43`		`- archiveArtifacts(artifacts: 'sonic-mgmt/tests/results/, sonic-mgmt/tests/logs/, kvmdump/**')`
	`43`	`+ archiveArtifacts(artifacts: 'sonic-mgmt/tests/results/, sonic-mgmt/tests/logs/, kvmdump/, ptfdump/')`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ pipeline {`
`37`	`37`	`post {`
`38`	`38`	`always {`
`39`	`39`	`junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/results/*/.xml')`
`40`		`- archiveArtifacts(artifacts: 'sonic-mgmt/tests/results/, sonic-mgmt/tests/logs/, kvmdump/**')`
	`40`	`+ archiveArtifacts(artifacts: 'sonic-mgmt/tests/results/, sonic-mgmt/tests/logs/, kvmdump/, ptfdump/')`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ pipeline {`
`68`	`68`
`69`	`69`	`always {`
`70`	`70`	`junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/results/*/.xml')`
`71`		`- archiveArtifacts(artifacts: 'sonic-mgmt/tests/results/, sonic-mgmt/tests/logs/, kvmdump/**')`
	`71`	`+ archiveArtifacts(artifacts: 'sonic-mgmt/tests/results/, sonic-mgmt/tests/logs/, kvmdump/, ptfdump/')`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`fixed {`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ sudo cp ../target/sonic-vs.bin /nfs/jenkins/sonic-vs-${JOB_NAME##*/}.${BUILD_NUM`
`88`	`88`	`post {`
`89`	`89`	`always {`
`90`	`90`	`junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/results/*/.xml')`
`91`		`- archiveArtifacts(artifacts: 'target/, sonic-mgmt/tests/results/, sonic-mgmt/tests/logs/, kvmdump/')`
	`91`	`+ archiveArtifacts(artifacts: 'target/, sonic-mgmt/tests/results/, sonic-mgmt/tests/logs/, kvmdump/, ptfdump/**')`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ pipeline {`
`67`	`67`	`post {`
`68`	`68`
`69`	`69`	`always {`
`70`		`- archiveArtifacts(artifacts: 'sonic-mgmt/tests/logs/, sonic-mgmt/tests/results/, kvmdump/**')`
	`70`	`+ archiveArtifacts(artifacts: 'sonic-mgmt/tests/logs/, sonic-mgmt/tests/results/, kvmdump/, ptfdump/')`
`71`	`71`	`junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/results/*/.xml')`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ sudo cp ../target/sonic-vs-dbg.bin /nfs/jenkins/sonic-vs-dbg-${JOB_NAME##*/}.${B`
`101`	`101`	`post {`
`102`	`102`	`always {`
`103`	`103`	`junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/results/*/.xml')`
`104`		`- archiveArtifacts(artifacts: 'target/, sonic-mgmt/tests/results/, sonic-mgmt/tests/logs/, kvmdump/')`
	`104`	`+ archiveArtifacts(artifacts: 'target/, sonic-mgmt/tests/results/, sonic-mgmt/tests/logs/, kvmdump/, ptfdump/**')`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`