Merge "jjb: xci: Do not wipe clean VM on failures"

diff --combined jjb/xci/xci-verify-jobs.yaml
index 7d0f905,c5badc6..47ae4f8
--- 1/jjb/xci/xci-verify-jobs.yaml
--- 2/jjb/xci/xci-verify-jobs.yaml
+++ b/jjb/xci/xci-verify-jobs.yaml
@@@ -149,9 -149,6 +149,9 @@@
        - string:
            name: CI_LOOP
            default: 'verify'
 +      - string:
 +          name: FUNCTEST_VERSION
 +          default: 'hunter'
        - string:
            name: FUNCTEST_MODE
            default: 'tier'
@@@ -164,6 -161,7 +164,7 @@@
            description: 'Git URL to use on this Jenkins Slave'
  
      builders:
+       - 'xci-verify-clean-vm-macro'
        - 'xci-verify-set-scenario-macro'
        - inject:
            properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
@@@ -184,7 -182,6 +185,7 @@@
                  GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                  GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                  CI_LOOP=$CI_LOOP
 +                FUNCTEST_VERSION=$FUNCTEST_VERSION
                  FUNCTEST_MODE=$FUNCTEST_MODE
                  FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
                node-parameters: true
@@@ -205,7 -202,6 +206,7 @@@
                  GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                  GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                  CI_LOOP=$CI_LOOP
 +                FUNCTEST_VERSION=$FUNCTEST_VERSION
                  FUNCTEST_MODE=$FUNCTEST_MODE
                  FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
                node-parameters: true
@@@ -218,7 -214,6 +219,6 @@@
              - role: BOTH
                build-on:
                  - ABORTED
-                 - FAILURE
                  - NOT_BUILT
                  - SUCCESS
                  - UNSTABLE
@@@ -255,9 -250,6 +255,9 @@@
        - string:
            name: CI_LOOP
            default: 'verify'
 +      - string:
 +          name: FUNCTEST_VERSION
 +          default: 'hunter'
        - string:
            name: FUNCTEST_MODE
            default: 'tier'
@@@ -297,6 -289,12 +297,12 @@@
  # -------------------------------
  # builder macros
  # -------------------------------
+ - builder:
+     name: 'xci-verify-clean-vm-macro'
+     builders:
+       - shell:
+           !include-raw: ./xci-cleanup.sh
+ 
  - builder:
      name: 'xci-verify-set-scenario-macro'
      builders: