Merge lp:~heber013/qa-jenkins-jobs/fix-destroy-vm-ust into lp:qa-jenkins-jobs

[Heber Parrucci]

Fix when destroying VM in UST

Fix when destroying VM in UST

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

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

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

review: Approve (continuous-integration)

[Jean-Baptiste Lallement (jibel)]

ok, thank!

review: Approve

=== modified file 'jobs/ubuntu-system-tests/ubuntu-system-tests-run-tests-builder.sh'
--- jobs/ubuntu-system-tests/ubuntu-system-tests-run-tests-builder.sh	2017-08-24 14:21:32 +0000
+++ jobs/ubuntu-system-tests/ubuntu-system-tests-run-tests-builder.sh	2017-08-28 15:12:52 +0000
@@ -12,7 +12,7 @@
     echo "I: Cleaning disk image file"
     if [ "$CLEAN_DISK_IMG_AFTER_RUN" == "true" ]; then
         echo "I: Cleaning disk image file"
-        [ -f "$SHARED_IMG_PATH" ] && delete_vm $(basename "$SHARED_IMG_PATH") || sudo rm -f "$SHARED_IMG_PATH"
+        [ -f "$SHARED_IMG_PATH" ] && delete_vm $(basename $(dirname "$SHARED_IMG_PATH")) || sudo rm -f "$SHARED_IMG_PATH"
     fi
 }