From: Serena Feng <feng.xiaowei@zte.com.cn>
Date: Mon, 27 Mar 2017 02:32:49 +0000 (+0000)
Subject: Merge "Avoid build conflicts in build server"
X-Git-Tag: danube.1.0~63
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=eab89fda5f0fde5b8c608b7facb3f8d45970a8ec;hp=2bfc153956db44a47d4c58fa4bc4afc1c3b8a701;p=releng.git

Merge "Avoid build conflicts in build server"
---

diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index ffae70f8f..c5d8e7e8b 100644
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -70,7 +70,8 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - 'daisy.*-deploy-({pod})?-daily-.*'
+                - 'daisy-daily-.*'
+                - 'daisy4nfv-(merge|verify)-.*'
             block-level: 'NODE'
 
     wrappers:
diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml
index 9a57e1753..52769ca88 100644
--- a/jjb/daisy4nfv/daisy-project-jobs.yml
+++ b/jjb/daisy4nfv/daisy-project-jobs.yml
@@ -141,7 +141,8 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - '{installer}-.*deploy-.*'
+                - '{installer}-daily-.*'
+                - 'daisy4nfv-(merge|verify)-.*'
             block-level: 'NODE'
 
     scm:
diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
index 11531f4a4..95e72e550 100644
--- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
@@ -21,7 +21,7 @@
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: false
+            disabled: true
 #####################################
 # patch merge phases
 #####################################
@@ -148,7 +148,8 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - '{alias}-merge-deploy-.*'
+                - '{alias}-(merge|verify)-.*'
+                - '{project}-daily-.*'
             block-level: 'NODE'
 
     scm:
diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
index ee78ab59f..9f44d99fb 100644
--- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
@@ -138,7 +138,8 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - '{alias}-verify-deploy-.*'
+                - '{alias}-(merge|verify)-.*'
+                - '{installer}-daily-.*'
             block-level: 'NODE'
 
     scm: