From 657754d853dcd60dc08b3ae335b02937a626dbf3 Mon Sep 17 00:00:00 2001
From: Zhijiang Hu <hu.zhijiang@zte.com.cn>
Date: Fri, 28 Jul 2017 11:48:31 +0800
Subject: Rectify inter-job blocking strategy

In order to completely solve the job interfer problem [1], this PS
does:
1) Block the right job by changing {installer}-(merge|verify)-.*
to {alias}-(merge|verify)-.*.
2) Let daily-build, verify-build, and merge-build to block each
other.

[1] https://gerrit.opnfv.org/gerrit/#/c/38145/

Change-Id: If0c92367106b62c372b70278b9fdfd9f49e996cb
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
---
 jjb/daisy4nfv/daisy-project-jobs.yml    | 2 ++
 jjb/daisy4nfv/daisy4nfv-merge-jobs.yml  | 1 +
 jjb/daisy4nfv/daisy4nfv-verify-jobs.yml | 5 +++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml
index 57e44e314..a11d23fa5 100644
--- a/jjb/daisy4nfv/daisy-project-jobs.yml
+++ b/jjb/daisy4nfv/daisy-project-jobs.yml
@@ -54,6 +54,8 @@
             use-build-blocker: true
             blocking-jobs:
                 - '{installer}-daily-.*'
+                - 'daisy4nfv-merge-build-.*'
+                - 'daisy4nfv-verify-build-.*'
             block-level: 'NODE'
 
     scm:
diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
index 561ffbe24..f7a6c1363 100644
--- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
@@ -154,6 +154,7 @@
             use-build-blocker: true
             blocking-jobs:
                 - '{alias}-merge-{phase}-.*'
+                - '{installer}-daily-.*'
             block-level: 'NODE'
 
     scm:
diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
index dff0ff0a4..6f6ab0fb0 100644
--- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
@@ -50,7 +50,7 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - '{installer}-merge-build-.*'
+                - '{alias}-merge-build-.*'
             block-level: 'NODE'
 
     scm:
@@ -147,8 +147,9 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - '{installer}-merge-build-.*'
+                - '{alias}-merge-build-.*'
                 - '{alias}-verify-build-.*'
+                - '{installer}-daily-.*'
             block-level: 'NODE'
 
     scm:
-- 
cgit 1.2.3-korg