summaryrefslogtreecommitdiffstats
path: root/jjb/xci/xci-merge-jobs.yaml
diff options
context:
space:
mode:
authorAric Gardner <agardner@linuxfoundation.org>2018-10-04 16:09:17 -0400
committerAric Gardner <agardner@linuxfoundation.org>2018-10-12 11:52:12 -0400
commit6a2f75928ca54b0566ac116ec608cd4a37c23227 (patch)
tree8f27737262405b0f4c023d064dc9e786bcb42935 /jjb/xci/xci-merge-jobs.yaml
parentf63d4bda4c6dd54d22991b7577df7f885a95f90f (diff)
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>
Diffstat (limited to 'jjb/xci/xci-merge-jobs.yaml')
-rw-r--r--jjb/xci/xci-merge-jobs.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/jjb/xci/xci-merge-jobs.yaml b/jjb/xci/xci-merge-jobs.yaml
index a499ec9be..b369ec19d 100644
--- 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: