summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/xci/xci-merge-jobs.yml14
1 files changed, 10 insertions, 4 deletions
diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml
index df2d38e5f..8b5086487 100644
--- a/jjb/xci/xci-merge-jobs.yml
+++ b/jjb/xci/xci-merge-jobs.yml
@@ -15,10 +15,16 @@
distro:
- ubuntu:
disabled: false
+ kill-phase-on: FAILURE
+ abort-all-job: true
- centos:
disabled: false
+ kill-phase-on: NEVER
+ abort-all-job: false
- opensuse:
disabled: false
+ kill-phase-on: FAILURE
+ abort-all-job: true
# -------------------------------
# postmerge promotion phases
# -------------------------------
@@ -282,8 +288,8 @@
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
node-parameters: true
- kill-phase-on: FAILURE
- abort-all-job: true
+ kill-phase-on: '{kill-phase-on}'
+ abort-all-job: '{abort-all-job}'
- multijob:
name: healthcheck
condition: SUCCESSFUL
@@ -302,8 +308,8 @@
FUNCTEST_MODE=$FUNCTEST_MODE
FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
node-parameters: true
- kill-phase-on: NEVER
- abort-all-job: true
+ kill-phase-on: '{kill-phase-on}'
+ abort-all-job: '{abort-all-job}'
publishers:
- postbuildscript: