summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/apex/apex.yaml20
-rw-r--r--jjb/apex/apex.yaml.j220
2 files changed, 20 insertions, 20 deletions
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 80a4d82f5..6136c9c78 100644
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -312,7 +312,7 @@
- logrotate-default
- build-blocker:
use-build-blocker: false
- blocking-level: 'NODE'
+ block-level: 'NODE'
blocking-jobs:
- 'apex-deploy.*'
- throttle:
@@ -389,7 +389,7 @@
- logrotate-default
- build-blocker:
use-build-blocker: true
- blocking-level: 'NODE'
+ block-level: 'NODE'
blocking-jobs:
- 'apex-deploy.*'
- 'functest.*'
@@ -445,7 +445,7 @@
- logrotate-default
- build-blocker:
use-build-blocker: true
- blocking-level: 'NODE'
+ block-level: 'NODE'
blocking-jobs:
- 'apex-runner.*'
- 'apex-run.*'
@@ -541,7 +541,7 @@
- logrotate-default
- build-blocker:
use-build-blocker: true
- blocking-level: 'NODE'
+ block-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
@@ -645,7 +645,7 @@
- logrotate-default
- build-blocker:
use-build-blocker: true
- blocking-level: 'NODE'
+ block-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
@@ -761,7 +761,7 @@
- logrotate-default
- build-blocker:
use-build-blocker: true
- blocking-level: 'NODE'
+ block-level: 'NODE'
blocking-jobs:
- 'apex-daily.*'
@@ -895,7 +895,7 @@
properties:
- build-blocker:
use-build-blocker: true
- blocking-level: 'NODE'
+ block-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
@@ -1040,7 +1040,7 @@
properties:
- build-blocker:
use-build-blocker: true
- blocking-level: 'NODE'
+ block-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-deploy.*'
@@ -1146,7 +1146,7 @@
- logrotate-default
- build-blocker:
use-build-blocker: true
- blocking-level: 'NODE'
+ block-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
@@ -1215,7 +1215,7 @@
- logrotate-default
- build-blocker:
use-build-blocker: true
- blocking-level: 'NODE'
+ block-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index 7203cb4b9..1b8c09c2d 100644
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -158,7 +158,7 @@
- logrotate-default
- build-blocker:
use-build-blocker: false
- blocking-level: 'NODE'
+ block-level: 'NODE'
blocking-jobs:
- 'apex-deploy.*'
- throttle:
@@ -235,7 +235,7 @@
- logrotate-default
- build-blocker:
use-build-blocker: true
- blocking-level: 'NODE'
+ block-level: 'NODE'
blocking-jobs:
- 'apex-deploy.*'
- 'functest.*'
@@ -291,7 +291,7 @@
- logrotate-default
- build-blocker:
use-build-blocker: true
- blocking-level: 'NODE'
+ block-level: 'NODE'
blocking-jobs:
- 'apex-runner.*'
- 'apex-run.*'
@@ -387,7 +387,7 @@
- logrotate-default
- build-blocker:
use-build-blocker: true
- blocking-level: 'NODE'
+ block-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
@@ -491,7 +491,7 @@
- logrotate-default
- build-blocker:
use-build-blocker: true
- blocking-level: 'NODE'
+ block-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
@@ -607,7 +607,7 @@
- logrotate-default
- build-blocker:
use-build-blocker: true
- blocking-level: 'NODE'
+ block-level: 'NODE'
blocking-jobs:
- 'apex-daily.*'
@@ -741,7 +741,7 @@
properties:
- build-blocker:
use-build-blocker: true
- blocking-level: 'NODE'
+ block-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
@@ -886,7 +886,7 @@
properties:
- build-blocker:
use-build-blocker: true
- blocking-level: 'NODE'
+ block-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-deploy.*'
@@ -992,7 +992,7 @@
- logrotate-default
- build-blocker:
use-build-blocker: true
- blocking-level: 'NODE'
+ block-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
@@ -1061,7 +1061,7 @@
- logrotate-default
- build-blocker:
use-build-blocker: true
- blocking-level: 'NODE'
+ block-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'