xci: Make centos jobs non-voting for promotion

[releng.git] / jjb / xci / xci-merge-jobs.yml

diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml
index df2d38e..8b50864 100644 (file)
--- 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: