Update jenkins-job-builder to 2.2.1

jjb/lf-ci-jobs.yaml has jjb-version: 2.2.1 as a minimum

change block-level to blocking-level:
https://review.openstack.org/#/c/608092/
We will need to change this back once we move past
jenkins-job-builder>2.5.0

Change-Id: I12d0f55ee3c2dad20340ebf0fa8428ee1ad8484c
Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>

diff --git a/jjb/3rd_party_ci/odl-netvirt.yaml b/jjb/3rd_party_ci/odl-netvirt.yaml
index b810a29..15d2848 100644 (file)
--- a/jjb/3rd_party_ci/odl-netvirt.yaml
+++ b/jjb/3rd_party_ci/odl-netvirt.yaml
@@ -63,7 +63,7 @@
             - 'odl-netvirt-verify-virtual-install-netvirt-.*'
             - 'functest-netvirt-virtual-suite-.*'
             - 'odl-netvirt-verify-virtual-postprocess-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
     scm:
       - git:
           url: https://gerrit.opnfv.org/gerrit/apex
@@ -224,7 +224,7 @@
             - 'odl-netvirt-verify-virtual-install-netvirt-.*'
             - 'functest-netvirt-virtual-suite-.*'
             - 'odl-netvirt-verify-virtual-postprocess-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - ssh-agent-wrapper

diff --git a/jjb/apex/apex-project-jobs.yaml b/jjb/apex/apex-project-jobs.yaml
index 540b1ac..42567ea 100644 (file)
--- a/jjb/apex/apex-project-jobs.yaml
+++ b/jjb/apex/apex-project-jobs.yaml
@@ -73,7 +73,7 @@
           option: 'project'
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify-iso-{stream}'
 

diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml
index fdcd122..854aefc 100644 (file)
--- a/jjb/apex/apex-verify-jobs.yaml
+++ b/jjb/apex/apex-verify-jobs.yaml
@@ -201,7 +201,7 @@
           option: 'project'
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-.*-promote.*'
     builders:
@@ -316,7 +316,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-virtual.*'

diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 0a5d9fb..57f7659 100644 (file)
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -310,7 +310,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: false
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-deploy.*'
       - throttle:
@@ -387,7 +387,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-deploy.*'
             - 'functest.*'
@@ -443,7 +443,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-runner.*'
             - 'apex-run.*'
@@ -547,7 +547,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-runner.*'
@@ -659,7 +659,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-runner.*'
@@ -774,7 +774,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-daily.*'
 
@@ -901,7 +901,7 @@
     properties:
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-runner.*'
@@ -1029,7 +1029,7 @@
     properties:
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-deploy.*'
@@ -1135,7 +1135,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-runner.*'
@@ -1204,7 +1204,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-runner.*'

diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index 33373d6..62a9555 100644 (file)
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -156,7 +156,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: false
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-deploy.*'
       - throttle:
@@ -233,7 +233,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-deploy.*'
             - 'functest.*'
@@ -289,7 +289,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-runner.*'
             - 'apex-run.*'
@@ -393,7 +393,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-runner.*'
@@ -505,7 +505,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-runner.*'
@@ -620,7 +620,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-daily.*'
 
@@ -747,7 +747,7 @@
     properties:
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-runner.*'
@@ -875,7 +875,7 @@
     properties:
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-deploy.*'
@@ -981,7 +981,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-runner.*'
@@ -1050,7 +1050,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-runner.*'

diff --git a/jjb/armband/armband-ci-jobs.yaml b/jjb/armband/armband-ci-jobs.yaml
index 1fd0d11..2ab1a6d 100644 (file)
--- a/jjb/armband/armband-ci-jobs.yaml
+++ b/jjb/armband/armband-ci-jobs.yaml
@@ -120,7 +120,7 @@
           blocking-jobs:
             - '{installer}-os-.*?-{pod}-daily-.*'
             - 'armband-verify-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - build-name:
@@ -264,7 +264,7 @@
           blocking-jobs:
             - '{installer}-deploy-{pod}-daily-{stream}'
             - '{installer}-deploy-generic-daily-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     parameters:
       - project-parameter:

diff --git a/jjb/auto/auto.yaml b/jjb/auto/auto.yaml
index 62f6ec2..58838d6 100644 (file)
--- a/jjb/auto/auto.yaml
+++ b/jjb/auto/auto.yaml
@@ -65,7 +65,7 @@
           use-build-blocker: true
           blocking-jobs:
             - '{installer}-os-.*?-{pod}-auto-daily-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - build-name:

diff --git a/jjb/clover/clover-project.yaml b/jjb/clover/clover-project.yaml
index 31eed8f..af9106f 100644 (file)
--- a/jjb/clover/clover-project.yaml
+++ b/jjb/clover/clover-project.yaml
@@ -122,7 +122,7 @@
           blocking-jobs:
             - 'clover-daily-deploy-.*?'
             - 'container4nfv-daily-deploy-.*?'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - timeout:

diff --git a/jjb/compass4nfv/compass-ci-jobs.yaml b/jjb/compass4nfv/compass-ci-jobs.yaml
index e5775b2..e229bc9 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yaml
+++ b/jjb/compass4nfv/compass-ci-jobs.yaml
@@ -162,7 +162,7 @@
             - 'compass-os-.*?-baremetal-daily-.*?'
             - 'compass-k8-.*?-baremetal-daily-.*?'
             - 'compass-verify-[^-]*-[^-]*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - fix-workspace-permissions
@@ -351,7 +351,7 @@
           blocking-jobs:
             - 'compass-deploy-{pod}-daily-.*?'
             - 'compass-verify-deploy-.*?'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - build-name:

diff --git a/jjb/compass4nfv/compass-dovetail-jobs.yaml b/jjb/compass4nfv/compass-dovetail-jobs.yaml
index c090863..ec62da3 100644 (file)
--- a/jjb/compass4nfv/compass-dovetail-jobs.yaml
+++ b/jjb/compass4nfv/compass-dovetail-jobs.yaml
@@ -51,7 +51,7 @@
           blocking-jobs:
             - 'compass-os-.*?-{pod}-daily-.*?'
             - 'compass-os-.*?-{pod}-weekly-.*?'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - build-name:
@@ -128,7 +128,7 @@
             - 'compass-deploy-{pod}-daily-.*?'
             - 'compass-deploy-{pod}-weekly-.*'
             - 'compass-verify-deploy-.*?'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - build-name:

diff --git a/jjb/compass4nfv/compass-verify-jobs.yaml b/jjb/compass4nfv/compass-verify-jobs.yaml
index f0cda82..58c4a04 100644 (file)
--- a/jjb/compass4nfv/compass-verify-jobs.yaml
+++ b/jjb/compass4nfv/compass-verify-jobs.yaml
@@ -71,7 +71,7 @@
             - 'compass-verify-[^-]*-[^-]*'
             - 'compass-os-.*?-virtual-daily-.*?'
             - 'compass-k8-.*?-virtual-daily-.*?'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - ssh-agent-wrapper
@@ -184,7 +184,7 @@
           blocking-jobs:
             - 'compass-verify-[^-]*-[^-]*'
             - 'compass-os-.*?-virtual-daily-.*?'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - ssh-agent-wrapper
@@ -279,7 +279,7 @@
             - 'compass-os-.*?-virtual-daily-.*?'
             - 'compass-verify-deploy-.*'
             - 'functest-compass-virtual.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - ssh-agent-wrapper

diff --git a/jjb/container4nfv/container4nfv-project.yaml b/jjb/container4nfv/container4nfv-project.yaml
index 194a1a9..ae9b436 100644 (file)
--- a/jjb/container4nfv/container4nfv-project.yaml
+++ b/jjb/container4nfv/container4nfv-project.yaml
@@ -119,7 +119,7 @@
           blocking-jobs:
             - 'clover-daily-deploy-.*?'
             - 'container4nfv-daily-deploy-.*?'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - timeout:

diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yaml b/jjb/daisy4nfv/daisy-daily-jobs.yaml
index ba03bc3..4a7e6e9 100644 (file)
--- a/jjb/daisy4nfv/daisy-daily-jobs.yaml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yaml
@@ -105,7 +105,7 @@
             - 'daisy-os-.*?-{pod}-daily-.*?'
             - 'daisy-daily-.*'
             - 'daisy-kolla-build-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - build-name:
@@ -191,7 +191,7 @@
             - '{installer}-(build|deploy|test)-daily-(fraser|master)'
             - '{installer}-deploy-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
             - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     parameters:
       - project-parameter:

diff --git a/jjb/daisy4nfv/daisy-project-jobs.yaml b/jjb/daisy4nfv/daisy-project-jobs.yaml
index ec5ba71..7914548 100644 (file)
--- a/jjb/daisy4nfv/daisy-project-jobs.yaml
+++ b/jjb/daisy4nfv/daisy-project-jobs.yaml
@@ -60,7 +60,7 @@
             - '{installer}-kolla-build-.*'
             - 'daisy-deploy-.*'
             - 'daisy-daily-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     scm:
       - git-scm
@@ -129,7 +129,7 @@
             - '{installer}-kolla-build-.*'
             - 'daisy4nfv-merge-build-.*'
             - 'daisy4nfv-verify-build-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     scm:
       - git-scm
@@ -221,7 +221,7 @@
             - '{installer}-daily-(build|deploy|test)-(fraser|master)'
             - '{installer}-.*-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
             - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     scm:
       - git-scm

diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml
index 7e03fab..c261c23 100644 (file)
--- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml
+++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml
@@ -61,7 +61,7 @@
           use-build-blocker: true
           blocking-jobs:
             - '{alias}-merge-(master|fraser)'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     scm:
       - git-scm
@@ -158,7 +158,7 @@
           blocking-jobs:
             - '{alias}-merge-{phase}-.*'
             - '{installer}-daily-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     scm:
       - git-scm

diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yaml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yaml
index 033beeb..c8c1db0 100644 (file)
--- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yaml
+++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yaml
@@ -55,7 +55,7 @@
           use-build-blocker: true
           blocking-jobs:
             - '{alias}-merge-build-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     scm:
       - git-scm-gerrit
@@ -158,7 +158,7 @@
             - '{alias}-merge-build-.*'
             - '{alias}-verify-build-.*'
             - '{installer}-daily-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     scm:
       - git-scm-gerrit

diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml
index c2a3dd7..936187c 100644 (file)
--- a/jjb/fuel/fuel-daily-jobs.yaml
+++ b/jjb/fuel/fuel-daily-jobs.yaml
@@ -132,7 +132,7 @@
           blocking-jobs:
             - 'fuel-os-.*?-{pod}-daily-.*'
             - 'fuel-verify-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - build-name:
@@ -280,7 +280,7 @@
           use-build-blocker: true
           blocking-jobs:
             - 'fuel-deploy-{pod}-daily-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     parameters:
       - project-parameter:

diff --git a/jjb/fuel/fuel-verify-jobs.yaml b/jjb/fuel/fuel-verify-jobs.yaml
index 56f0145..5695ef8 100644 (file)
--- a/jjb/fuel/fuel-verify-jobs.yaml
+++ b/jjb/fuel/fuel-verify-jobs.yaml
@@ -68,7 +68,7 @@
           blocking-jobs:
             - 'fuel-os-.*?-daily-.*'
             - 'fuel-verify-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     scm:
       - git-scm-gerrit
@@ -170,7 +170,7 @@
           blocking-jobs:
             - 'fuel-verify-docker-build-.*'
             - 'fuel-verify-deploy-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     scm:
       - git-scm-gerrit

diff --git a/jjb/global/releng-defaults.yaml b/jjb/global/releng-defaults.yaml
index ce008ca..34c5fdd 100644 (file)
--- a/jjb/global/releng-defaults.yaml
+++ b/jjb/global/releng-defaults.yaml
@@ -16,7 +16,7 @@
     build-node: 'opnfv-build'
     gerrit-server-name: 'gerrit.opnfv.org'
     jenkins-ssh-credential: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e'
-    jjb-version: '2.0.3'
+    jjb-version: '2.2.1'
     lftools-version: '<1.0.0'
 
     properties:

diff --git a/jjb/joid/joid-daily-jobs.yaml b/jjb/joid/joid-daily-jobs.yaml
index 2719c72..46ba1d2 100644 (file)
--- a/jjb/joid/joid-daily-jobs.yaml
+++ b/jjb/joid/joid-daily-jobs.yaml
@@ -97,7 +97,7 @@
           use-build-blocker: true
           blocking-jobs:
             - 'joid-(os|k8)-.*?-{pod}-daily-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - build-name:
@@ -186,7 +186,7 @@
           use-build-blocker: true
           blocking-jobs:
             - 'joid-deploy-{pod}-daily-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - build-name:

diff --git a/jjb/joid/joid-verify-jobs.yaml b/jjb/joid/joid-verify-jobs.yaml
index 2d1c7c9..95ab052 100644 (file)
--- a/jjb/joid/joid-verify-jobs.yaml
+++ b/jjb/joid/joid-verify-jobs.yaml
@@ -57,7 +57,7 @@
           blocking-jobs:
             - 'joid-verify-master'
             - 'joid-verify-danube'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     scm:
       - git-scm-gerrit
@@ -163,7 +163,7 @@
           blocking-jobs:
             - 'joid-verify-deploy-.*'
             - 'joid-verify-test-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     scm:
       - git-scm-gerrit

diff --git a/jjb/vswitchperf/vswitchperf.yaml b/jjb/vswitchperf/vswitchperf.yaml
index ba0742f..569b115 100644 (file)
--- a/jjb/vswitchperf/vswitchperf.yaml
+++ b/jjb/vswitchperf/vswitchperf.yaml
@@ -34,7 +34,7 @@
             - 'vswitchperf-verify-.*'
             - 'vswitchperf-merge-.*'
             - 'vswitchperf-daily-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     parameters:
       - project-parameter:
@@ -75,7 +75,7 @@
             - 'vswitchperf-verify-.*'
             - 'vswitchperf-merge-.*'
             - 'vswitchperf-daily-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     parameters:
       - project-parameter:
@@ -148,7 +148,7 @@
             - 'vswitchperf-verify-.*'
             - 'vswitchperf-merge-.*'
             - 'vswitchperf-daily-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     parameters:
       - project-parameter:

diff --git a/jjb/xci/bifrost-periodic-jobs.yaml b/jjb/xci/bifrost-periodic-jobs.yaml
index fbe2e20..3109e87 100644 (file)
--- a/jjb/xci/bifrost-periodic-jobs.yaml
+++ b/jjb/xci/bifrost-periodic-jobs.yaml
@@ -82,7 +82,7 @@
             - '^xci-functest.*'
             - '^bifrost-.*periodic.*'
             - '^osa-.*periodic.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
       - logrotate-default
 
     parameters:

diff --git a/jjb/xci/bifrost-verify-jobs.yaml b/jjb/xci/bifrost-verify-jobs.yaml
index 4ca7835..e1569fe 100644 (file)
--- a/jjb/xci/bifrost-verify-jobs.yaml
+++ b/jjb/xci/bifrost-verify-jobs.yaml
@@ -80,7 +80,7 @@
             - xci-verify-virtual
           option: category
 
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     parameters:
       - string:

diff --git a/jjb/xci/osa-periodic-jobs.yaml b/jjb/xci/osa-periodic-jobs.yaml
index 6c2d165..ecbf0fc 100644 (file)
--- a/jjb/xci/osa-periodic-jobs.yaml
+++ b/jjb/xci/osa-periodic-jobs.yaml
@@ -58,7 +58,7 @@
             - 'bifrost-periodic-{distro}-.*'
             - 'xci-osa-verify-{distro}-.*'
             - 'xci-osa-periodic-{distro}-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
       - throttle:
           max-per-node: 2
           max-total: 10
@@ -144,7 +144,7 @@
           blocking-jobs:
             - '.*-bifrost-verify-.*'
             - '.*-bifrost-periodic-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     parameters:
       - project-parameter:

diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml
index fcd4465..10708cc 100644 (file)
--- a/jjb/xci/xci-daily-jobs.yaml
+++ b/jjb/xci/xci-daily-jobs.yaml
@@ -119,7 +119,7 @@
             - '^xci-functest.*'
             - '^bifrost-.*periodic.*'
             - '^osa-.*periodic.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
       - logrotate-default
 
     triggers:
@@ -237,7 +237,7 @@
             - '^xci-functest.*'
             - '^bifrost-.*periodic.*'
             - '^osa-.*periodic.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
       - throttle:
           enabled: true
           max-per-node: 1

diff --git a/jjb/xci/xci-merge-jobs.yaml b/jjb/xci/xci-merge-jobs.yaml
index a499ec9..b369ec1 100644 (file)
--- a/jjb/xci/xci-merge-jobs.yaml
+++ b/jjb/xci/xci-merge-jobs.yaml
@@ -228,7 +228,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
@@ -353,7 +353,7 @@
             - '.*-bifrost-periodic-.*'
             - 'osa-verify-.*'
             - 'osa-periodic-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     parameters:
       - string:

diff --git a/jjb/xci/xci-verify-jobs.yaml b/jjb/xci/xci-verify-jobs.yaml
index 47ae4f8..ae98fa4 100644 (file)
--- a/jjb/xci/xci-verify-jobs.yaml
+++ b/jjb/xci/xci-verify-jobs.yaml
@@ -72,7 +72,7 @@
             - 'openstack-bifrost-verify-{distro}-.*'
             - 'xci-osa-verify-{distro}-.*'
             - 'xci-osa-periodic-{distro}-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
       - throttle:
           max-per-node: 2
           max-total: 10
@@ -243,7 +243,7 @@
             - '.*-bifrost-periodic-.*'
             - 'osa-verify-.*'
             - 'osa-periodic-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     parameters:
       - string:

diff --git a/tox.ini b/tox.ini
index d2f4168..976e9a5 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ setenv=
 
 [testenv:jjb]
 deps =
-  jenkins-job-builder==2.0.3
+  jenkins-job-builder==2.2.1
 commands=
   jenkins-jobs test -o job_output -r {posargs:"jjb/"}