build(jenkins): don't fail if post-build adb commands fail

tidev · May 14, 2019 · c4f6f25 · c4f6f25
1 parent add03e4
commit c4f6f25
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -96,21 +96,20 @@ def unitTests(os, nodeVersion, npmVersion, testSuiteBranch) {
 									archiveArtifacts 'mocha_*.crash'
 									sh 'rm -f mocha_*.crash'
 								} else {
-									// gather crash reports/tombstones for Android
-									sh 'adb -e pull /data/tombstones'
+									sh label: 'gather crash reports/tombstones for Android', returnStatus: true, script: 'adb -e pull /data/tombstones'
 									archiveArtifacts 'tombstones/'
 									sh 'rm -f tombstones/'
 									// wipe tombstones and re-build dir with proper permissions/ownership on emulator
-									sh 'adb -e shell rm -rf /data/tombstones'
-									sh 'adb -e shell mkdir -m 771 /data/tombstones'
-									sh 'adb -e shell chown system:system /data/tombstones'
+									sh returnStatus: true, script: 'adb -e shell rm -rf /data/tombstones'
+									sh returnStatus: true, script: 'adb -e shell mkdir -m 771 /data/tombstones'
+									sh returnStatus: true, script: 'adb -e shell chown system:system /data/tombstones'
 								}
 								throw e
 							} finally {
 								// Kill the emulators!
 								if ('android'.equals(os)) {
-									sh 'adb -e shell am force-stop com.appcelerator.testApp.testing'
-									sh 'adb -e uninstall com.appcelerator.testApp.testing'
+									sh returnStatus: true, script: 'adb -e shell am force-stop com.appcelerator.testApp.testing'
+									sh returnStatus: true, script: 'adb -e uninstall com.appcelerator.testApp.testing'
 									killAndroidEmulators()
 								} // if
 							} // finally