diff options
author | Markos Chandras <mchandras@suse.de> | 2018-09-19 13:07:31 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-09-19 13:07:31 +0000 |
commit | bfa5bcc3bacac5d18a936a875595078fc52035b5 (patch) | |
tree | 39d6be23246a3748edbec44d9ae9b57d59b7cd97 | |
parent | e59d12cec1800def7eac0025a1ba53bf17e4eeee (diff) | |
parent | dc5dbd3e33a7a1a5feeb8e2837609095dd3666f0 (diff) |
Merge "jjb: xci: Do not wipe clean VM on failures"
-rw-r--r-- | jjb/xci/xci-verify-jobs.yaml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/jjb/xci/xci-verify-jobs.yaml b/jjb/xci/xci-verify-jobs.yaml index 7d0f905b2..47ae4f8e2 100644 --- a/jjb/xci/xci-verify-jobs.yaml +++ b/jjb/xci/xci-verify-jobs.yaml @@ -164,6 +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" @@ -218,7 +219,6 @@ - role: BOTH build-on: - ABORTED - - FAILURE - NOT_BUILT - SUCCESS - UNSTABLE @@ -298,6 +298,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: - shell: |