update blocked jobs

issues:
* verify jobs delete previous job's container
* merge-build job is abnormally blocked by parent job

requirement:
verify jobs should block merge jobs

Change-Id: I63b64a9b46bf16d01cb34c863db887cdb9607421
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>

diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
index 9e7b867..48620fd 100644 (file)
--- 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:

diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
index a0ec2eb..7c044f7 100644 (file)
--- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
@@ -47,6 +47,12 @@
             enabled: true
             max-total: 4
             option: 'project'
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - '{installer}-merge-build-.*'
+            block-level: 'NODE'
+
     scm:
         - git-scm
     wrappers:
@@ -133,6 +139,13 @@
             enabled: true
             max-total: 6
             option: 'project'
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - '{installer}-merge-build-.*'
+                - '{alias}-verify-build-.*'
+            block-level: 'NODE'
+
     scm:
         - git-scm
     wrappers:
@@ -147,6 +160,7 @@
         - '{slave-label}-defaults'
         - '{alias}-verify-defaults':
             gs-pathname: '{gs-pathname}'
+
     builders:
         - description-setter:
             description: "Built on $NODE_NAME"