Ensure jobs don't get queued on offline builders

A change to the NodeLabelParameter config in JJB caused any jobs using
the plugin to possibly have their jobs triggered on builders which
weren't online.

This in turn caused the queue to backup and newer jobs are blocked
waiting for older ones to complete, which never happens as they're never
queued on an online builder.

The 'all-nodes' parameter ensure jobs that are set to run concurrently
don't trigger across all available nodes at once, as this will include
offline nodes as well. As this is the default of the plugin, projects
which need it can enable it individually.

Change-Id: Ia690eef078209b6b056dad85613dda6868b18271
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>

16 files changed, 140 insertions, 0 deletions

diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
index 2e500befb..365afdd30 100644
--- a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
+++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
@@ -126,6 +126,8 @@
           name: SLAVE_LABEL
           default: 'opnfv-build'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - project-parameter:
           project: $GERRIT_PROJECT
           branch: '{branch}'
diff --git a/jjb/fuel/fuel-docker-jobs.yaml b/jjb/fuel/fuel-docker-jobs.yaml
index 21656ed05..c06848e56 100644
--- a/jjb/fuel/fuel-docker-jobs.yaml
+++ b/jjb/fuel/fuel-docker-jobs.yaml
@@ -132,6 +132,8 @@
           name: SLAVE_LABEL
           default: 'opnfv-build-ubuntu'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: PROJECT
           default: "{project}"
@@ -174,6 +176,8 @@
           name: SLAVE_LABEL
           default: '{slave_label}'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index 14134fa56..19967e9fd 100644
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -230,6 +230,8 @@
           name: SLAVE_LABEL
           default: 'opnfv-build-ubuntu'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: PROJECT
           default: "{project}"
@@ -272,6 +274,8 @@
           name: SLAVE_LABEL
           default: '{slave_label}'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
diff --git a/jjb/functest/functest-kubernetes-docker.yaml b/jjb/functest/functest-kubernetes-docker.yaml
index 3836103a8..c328f5d86 100644
--- a/jjb/functest/functest-kubernetes-docker.yaml
+++ b/jjb/functest/functest-kubernetes-docker.yaml
@@ -183,6 +183,8 @@
           name: SLAVE_LABEL
           default: 'opnfv-build-ubuntu'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: PROJECT
           default: "{project}"
@@ -225,6 +227,8 @@
           name: SLAVE_LABEL
           default: '{slave_label}'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
diff --git a/jjb/functest/xtesting-docker.yaml b/jjb/functest/xtesting-docker.yaml
index 84bcb2185..88416bbf9 100644
--- a/jjb/functest/xtesting-docker.yaml
+++ b/jjb/functest/xtesting-docker.yaml
@@ -135,6 +135,8 @@
           name: SLAVE_LABEL
           default: 'opnfv-build-ubuntu'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: PROJECT
           default: "{project}"
@@ -176,6 +178,8 @@
           name: SLAVE_LABEL
           default: '{slave_label}'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml
index 023d2dd0b..805673a0a 100644
--- a/jjb/global/slave-params.yaml
+++ b/jjb/global/slave-params.yaml
@@ -10,6 +10,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-baremetal-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -25,6 +27,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-baremetal-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -40,6 +44,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-baremetal-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -55,6 +61,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-baremetal-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -70,6 +78,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-baremetal-danube'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -86,6 +96,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-virtual-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -101,6 +113,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-virtual-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -116,6 +130,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-virtual-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -131,6 +147,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-virtual-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -146,6 +164,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-virtual-danube'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -240,6 +260,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-baremetal'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -254,6 +276,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'compass-baremetal'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -265,6 +289,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'compass-baremetal-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -276,6 +302,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'compass-baremetal-branch'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -287,6 +315,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'fuel-baremetal'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -298,6 +328,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'armband-baremetal'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -309,6 +341,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'auto-baremetal'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -320,6 +354,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'joid-baremetal'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -342,6 +378,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'daisy-baremetal'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: INSTALLER_IP
           default: '10.20.7.3'
@@ -360,6 +398,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -375,6 +415,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'compass-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -386,6 +428,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'compass-arm-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -397,6 +441,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'compass-virtual-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -408,6 +454,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'compass-virtual-branch'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -419,6 +467,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'fuel-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -430,6 +480,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'armband-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -441,6 +493,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'joid-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -460,6 +514,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'daisy-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: INSTALLER_IP
           default: '10.20.11.2'
@@ -482,6 +538,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'opnfv-build-centos'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -498,6 +556,8 @@
           name: SLAVE_LABEL
           default: 'opnfv-build-ubuntu'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -514,6 +574,8 @@
           name: SLAVE_LABEL
           default: 'pharos-dashboard'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -530,6 +592,8 @@
           name: SLAVE_LABEL
           default: 'opnfv-build'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -546,6 +610,8 @@
           name: SLAVE_LABEL
           default: 'ericsson-build3'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -558,6 +624,8 @@
           name: SLAVE_LABEL
           default: 'ericsson-build4'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -589,6 +657,8 @@
           name: SLAVE_LABEL
           default: 'opnfv-build-ubuntu-arm'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -708,6 +778,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'huawei-test'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -726,6 +798,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'huawei-test'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -765,6 +839,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'huawei-virtual5'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -1080,6 +1156,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'ericsson-virtual5'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://git.opendaylight.org/gerrit/p/$PROJECT.git
@@ -1091,6 +1169,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'ericsson-virtual12'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -1102,6 +1182,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'ericsson-virtual13'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -1113,6 +1195,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'ericsson-virtual-pod1bl01'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -1124,6 +1208,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'odl-netvirt-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -1135,6 +1221,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'odl-netvirt-virtual-intel'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -1165,6 +1253,8 @@
           name: SLAVE_LABEL
           default: 'sandbox-baremetal'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -1181,6 +1271,8 @@
           name: SLAVE_LABEL
           default: 'sandbox-virtual'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -1197,6 +1289,8 @@
           name: SLAVE_LABEL
           default: 'dummy-pod1'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
diff --git a/jjb/openci/openci-opnfv-daily-jobs.yaml b/jjb/openci/openci-opnfv-daily-jobs.yaml
index afa8effea..020171bc2 100644
--- a/jjb/openci/openci-opnfv-daily-jobs.yaml
+++ b/jjb/openci/openci-opnfv-daily-jobs.yaml
@@ -47,6 +47,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'xci-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
 
     wrappers:
       - credentials-binding:
@@ -104,6 +106,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'xci-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
 
     wrappers:
       - credentials-binding:
diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml
index 87c37b3e6..1492a68ff 100644
--- a/jjb/opnfvdocs/docs-rtd.yaml
+++ b/jjb/opnfvdocs/docs-rtd.yaml
@@ -29,6 +29,8 @@
           name: SLAVE_LABEL
           default: 'lf-build1'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
@@ -60,6 +62,8 @@
           name: SLAVE_LABEL
           default: 'lf-build2'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
diff --git a/jjb/releng/compass4nfv-docker.yaml b/jjb/releng/compass4nfv-docker.yaml
index 2a5453658..491da0e59 100644
--- a/jjb/releng/compass4nfv-docker.yaml
+++ b/jjb/releng/compass4nfv-docker.yaml
@@ -216,6 +216,8 @@
           name: SLAVE_LABEL
           default: '{slave_label}'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
diff --git a/jjb/releng/testresults-automate.yaml b/jjb/releng/testresults-automate.yaml
index 01fbe0c6d..3a9beadfe 100644
--- a/jjb/releng/testresults-automate.yaml
+++ b/jjb/releng/testresults-automate.yaml
@@ -28,6 +28,8 @@
           name: SLAVE_LABEL
           default: 'testresults'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - project-parameter:
           project: 'releng-testresults'
           branch: 'master'
diff --git a/jjb/xci/bifrost-periodic-jobs.yaml b/jjb/xci/bifrost-periodic-jobs.yaml
index 3109e87ce..4c61be193 100644
--- a/jjb/xci/bifrost-periodic-jobs.yaml
+++ b/jjb/xci/bifrost-periodic-jobs.yaml
@@ -122,6 +122,8 @@
       - label:
           name: SLAVE_LABEL
           default: '{slave-label}'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: CI_LOOP
           default: 'periodic'
diff --git a/jjb/xci/bifrost-verify-jobs.yaml b/jjb/xci/bifrost-verify-jobs.yaml
index e1569fe94..f895cf672 100644
--- a/jjb/xci/bifrost-verify-jobs.yaml
+++ b/jjb/xci/bifrost-verify-jobs.yaml
@@ -128,6 +128,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'xci-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: CI_LOOP
           default: 'verify'
diff --git a/jjb/xci/osa-periodic-jobs.yaml b/jjb/xci/osa-periodic-jobs.yaml
index ecbf0fcbb..b731bf52b 100644
--- a/jjb/xci/osa-periodic-jobs.yaml
+++ b/jjb/xci/osa-periodic-jobs.yaml
@@ -82,6 +82,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'xci-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: OPENSTACK_OSA_VERSION
           default: 'master'
diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml
index eaeb841d0..18b20f2ac 100644
--- a/jjb/xci/xci-daily-jobs.yaml
+++ b/jjb/xci/xci-daily-jobs.yaml
@@ -138,6 +138,8 @@
       - label:
           name: SLAVE_LABEL
           default: '{slave-label}'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: XCI_DISTRO
           default: '{distro}'
@@ -272,6 +274,8 @@
       - label:
           name: SLAVE_LABEL
           default: '{slave-label}'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: FUNCTEST_VERSION
           default: 'hunter'
diff --git a/jjb/xci/xci-merge-jobs.yaml b/jjb/xci/xci-merge-jobs.yaml
index b369ec19d..c468be6d1 100644
--- a/jjb/xci/xci-merge-jobs.yaml
+++ b/jjb/xci/xci-merge-jobs.yaml
@@ -108,6 +108,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'xci-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: CI_LOOP
           default: 'merge'
@@ -252,6 +254,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'xci-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: CI_LOOP
           default: 'merge'
diff --git a/jjb/xci/xci-verify-jobs.yaml b/jjb/xci/xci-verify-jobs.yaml
index ae98fa49d..9edf55597 100644
--- a/jjb/xci/xci-verify-jobs.yaml
+++ b/jjb/xci/xci-verify-jobs.yaml
@@ -140,6 +140,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'xci-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: DISTRO
           default: '{distro}'