From 1d1d80988e14c7f235c63d996be9fa2ccc5a5491 Mon Sep 17 00:00:00 2001
From: Julien <zhang.jun3g@zte.com.cn>
Date: Thu, 23 Mar 2017 16:33:45 +0800
Subject: [PATCH] Avoid build conflicts in build server

Currently each job in daisy project has multiple child jobs, which may
block the resources in lf-build1 for the excutors are limited.

Change-Id: I7977128a550421caaeda395fce04b91b31d35751
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
---
 jjb/daisy4nfv/daisy-daily-jobs.yml      | 3 ++-
 jjb/daisy4nfv/daisy-project-jobs.yml    | 3 ++-
 jjb/daisy4nfv/daisy4nfv-merge-jobs.yml  | 5 +++--
 jjb/daisy4nfv/daisy4nfv-verify-jobs.yml | 3 ++-
 4 files changed, 9 insertions(+), 5 deletions(-)

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:
-- 
2.16.6