summaryrefslogtreecommitdiffstats
path: root/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/daisy4nfv/daisy4nfv-merge-jobs.yml')
-rw-r--r--jjb/daisy4nfv/daisy4nfv-merge-jobs.yml7
1 files changed, 6 insertions, 1 deletions
diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
index c676e8257..561ffbe24 100644
--- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
@@ -54,6 +54,11 @@
enabled: true
max-total: 4
option: 'project'
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - '{alias}-merge-(master|danube)'
+ block-level: 'NODE'
scm:
- git-scm
@@ -148,7 +153,7 @@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - '{alias}-merge-(master|danube)'
+ - '{alias}-merge-{phase}-.*'
block-level: 'NODE'
scm: