Merge lp:~heber013/qa-jenkins-jobs/adding-cleanup-function into lp:qa-jenkins-jobs

[Heber Parrucci]

Adding trap to clean up VM in case of failures

Adding trap to clean up VM in case of failures

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:280
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/191/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-zesty-amd64-package/42
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-zesty-amd64-package/42/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-zesty-i386-package/42
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-zesty-i386-package/42/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2388/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/191/rebuild

review: Approve (continuous-integration)

[Jean-Baptiste Lallement (jibel)]

Thanks. Comments inline

review: Needs Fixing

[lp:~heber013/qa-jenkins-jobs/adding-cleanup-function]

281. By Heber Parrucci on 2017-08-08

Adding trap to clean up VM in case of failures

[Heber Parrucci (heber013)]

Comment addressed. Thanks

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:281
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/192/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-zesty-amd64-package/43
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-zesty-amd64-package/43/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-zesty-i386-package/43
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-zesty-i386-package/43/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2389/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/192/rebuild

review: Approve (continuous-integration)

[Joshua Powers (powersj)]

review: Approve

=== modified file 'scripts/iso-testing/run-iso-test.sh'
--- scripts/iso-testing/run-iso-test.sh	2017-08-04 12:47:19 +0000
+++ scripts/iso-testing/run-iso-test.sh	2017-08-08 17:16:25 +0000
@@ -2,6 +2,20 @@
 
 set +e
 set -u
+set -x
+
+on_exit() {
+    # Exit Handler
+    if [ -z ${RETCODE} ] || [ ${RETCODE} != 0 ]; then
+        [ ! -z "$machine_name" ] && [ -d "$SHARED_IMG_PATH"/"$machine_name" ] && sudo rm -rf  "$SHARED_IMG_PATH"/"$machine_name"
+        exit "${RETCODE:=1}"
+    else
+        echo SUCCESS!!!!
+        exit 0
+    fi
+}
+
+trap on_exit EXIT INT QUIT ABRT PIPE TERM
 
 usage() {
     # Display script usage
@@ -99,11 +113,9 @@
 # results file
 [ -n "$(find "$LOG_DIR" -name '*.yaml')" ] && mv "$LOG_DIR"/*.yaml "$WORKSPACE"
 if [ "$RETCODE" -gt "100" ] ; then # utah client had an error, probably a test failure
-    [ ! -z "$machine_name" ] && [ -d "$SHARED_IMG_PATH"/"$machine_name" ] && sudo rm -rf  "$SHARED_IMG_PATH"/"$machine_name"
     exit $RETCODE
 elif [ "$RETCODE" -eq "0" ] ; then
     echo "<testsuite><testcase classname=\"utah\" name=\"utah\"></testcase></testsuite>" > "$WORKSPACE"/utah.xml
 else
-    [ ! -z "$machine_name" ] && [ -d "$SHARED_IMG_PATH"/"$machine_name" ] && sudo rm -rf  "$SHARED_IMG_PATH"/"$machine_name"
     echo "<testsuite><testcase classname=\"utah\" name=\"utah\"><failure>utah exited with status $RETCODE</failure></testcase></testsuite>" > "$WORKSPACE"/utah.xml
 fi