X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fxci-merge-jobs.yaml;h=666ca96809e09f837cf03fb155ec6f0e23841cf8;hb=de2e7d2c03750a80849dcdb5c47830dbe2c0c1d0;hp=a499ec9be216a032ee0b44ca8fd7f366722dc47a;hpb=49f6d3509d810fed4cbc15e1b0b86cf1eb8b266e;p=releng.git

diff --git a/jjb/xci/xci-merge-jobs.yaml b/jjb/xci/xci-merge-jobs.yaml
index a499ec9be..666ca9680 100644
--- a/jjb/xci/xci-merge-jobs.yaml
+++ b/jjb/xci/xci-merge-jobs.yaml
@@ -9,13 +9,13 @@
     stream:
       - master:
           branch: '{stream}'
-          disabled: false
+          disabled: true
     # -------------------------------
     # distros
     # -------------------------------
     distro:
       - ubuntu:
-          disabled: false
+          disabled: true
           kill-phase-on: FAILURE
           abort-all-job: true
       - centos:
@@ -23,7 +23,7 @@
           kill-phase-on: NEVER
           abort-all-job: false
       - opensuse:
-          disabled: false
+          disabled: true
           kill-phase-on: FAILURE
           abort-all-job: true
     # -------------------------------
@@ -108,6 +108,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'xci-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: CI_LOOP
           default: 'merge'
@@ -228,7 +230,7 @@
             - 'openstack-bifrost-verify-{distro}-.*'
             - 'xci-osa-verify-{distro}-.*'
             - 'xci-osa-periodic-{distro}-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
       - throttle:
           max-per-node: 1
           max-total: 3
@@ -252,6 +254,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'xci-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: CI_LOOP
           default: 'merge'
@@ -353,7 +357,7 @@
             - '.*-bifrost-periodic-.*'
             - 'osa-verify-.*'
             - 'osa-periodic-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     parameters:
       - string: