From: Serena Feng <feng.xiaowei@zte.com.cn>
Date: Fri, 26 May 2017 02:17:44 +0000 (+0000)
Subject: Merge "update blocked jobs"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b02bc03691fda71399390a69ca1b056ce6bd7eac;p=releng.git

Merge "update blocked jobs"
---

b02bc03691fda71399390a69ca1b056ce6bd7eac
diff --cc jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
index 6335c33a2,7c044f716..aac7d407c
--- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
@@@ -47,8 -47,14 +47,14 @@@
              enabled: true
              max-total: 4
              option: 'project'
+         - build-blocker:
+             use-build-blocker: true
+             blocking-jobs:
+                 - '{installer}-merge-build-.*'
+             block-level: 'NODE'
+ 
      scm:
 -        - git-scm
 +        - git-scm-gerrit
      wrappers:
          - ssh-agent-wrapper
          - timeout:
@@@ -138,8 -139,15 +144,15 @@@
              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
 +        - git-scm-gerrit
      wrappers:
          - ssh-agent-wrapper
          - timeout: