summaryrefslogtreecommitdiffstats
path: root/jjb/xci/xci-merge-jobs.yaml
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2018-05-17 18:36:40 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-05-17 18:36:40 +0000
commiteb8807b84954e41c39ce6c6f413d15c853dcf3a0 (patch)
tree4b61294cbf028c56cace71a8f1e59bff72423d6c /jjb/xci/xci-merge-jobs.yaml
parent9488d13c0446a29e3e226bfcd9da666e27e5143b (diff)
parent070e10f2ce201755dc244f42aa5272d6f918b633 (diff)
Merge "Update postbuildscript syntax for JJB 2.0.3"
Diffstat (limited to 'jjb/xci/xci-merge-jobs.yaml')
-rw-r--r--jjb/xci/xci-merge-jobs.yaml14
1 files changed, 10 insertions, 4 deletions
diff --git a/jjb/xci/xci-merge-jobs.yaml b/jjb/xci/xci-merge-jobs.yaml
index 2d112c7e5..cb438ad5d 100644
--- a/jjb/xci/xci-merge-jobs.yaml
+++ b/jjb/xci/xci-merge-jobs.yaml
@@ -316,11 +316,17 @@
publishers:
- postbuildscript:
- script-only-if-succeeded: false
- script-only-if-failed: false
builders:
- - shell:
- !include-raw: ./xci-cleanup.sh
+ - role: BOTH
+ build-on:
+ - ABORTED
+ - FAILURE
+ - NOT_BUILT
+ - SUCCESS
+ - UNSTABLE
+ build-steps:
+ - shell: !include-raw: ./xci-cleanup.sh
+ mark-unstable-if-failed: true
- job-template:
name: 'xci-merge-{distro}-{phase}-virtual-{stream}'