X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fxci-merge-jobs.yaml;h=c468be6d101a438d9e40165c5af179fe6c92ec3b;hb=513b05275cbac2ff98950bb0a384a275dd8884f5;hp=afa88a224e7121581b122b5359009ee7af72b8fa;hpb=b55046ac8825f81dcd440fa772ba179e172faacc;p=releng.git

diff --git a/jjb/xci/xci-merge-jobs.yaml b/jjb/xci/xci-merge-jobs.yaml
index afa88a224..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'
@@ -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,9 +254,14 @@
       - label:
           name: SLAVE_LABEL
           default: 'xci-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: CI_LOOP
           default: 'merge'
+      - string:
+          name: FUNCTEST_VERSION
+          default: 'hunter'
       - string:
           name: FUNCTEST_MODE
           default: 'tier'
@@ -292,6 +299,7 @@
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                FUNCTEST_VERSION=$FUNCTEST_VERSION
                 FUNCTEST_MODE=$FUNCTEST_MODE
                 FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
               node-parameters: true
@@ -312,6 +320,7 @@
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                 CI_LOOP=$CI_LOOP
+                FUNCTEST_VERSION=$FUNCTEST_VERSION
                 FUNCTEST_MODE=$FUNCTEST_MODE
                 FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
               node-parameters: true
@@ -348,7 +357,7 @@
             - '.*-bifrost-periodic-.*'
             - 'osa-verify-.*'
             - 'osa-periodic-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     parameters:
       - string:
@@ -360,6 +369,9 @@
       - string:
           name: CI_LOOP
           default: 'merge'
+      - string:
+          name: FUNCTEST_VERSION
+          default: 'hunter'
       - string:
           name: FUNCTEST_MODE
           default: 'tier'