summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorSerena Feng <feng.xiaowei@zte.com.cn>2017-09-07 01:37:43 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-07 01:37:43 +0000
commit20b31307c730a6561107dba6299d3a47dd4c3090 (patch)
tree806028a7c1245fb9e52118163467271b3bfe084d /jjb
parent0f45e69f0795b38a9be054a78caa5b6204ada076 (diff)
parent657754d853dcd60dc08b3ae335b02937a626dbf3 (diff)
Merge "Rectify inter-job blocking strategy"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/daisy4nfv/daisy-project-jobs.yml2
-rw-r--r--jjb/daisy4nfv/daisy4nfv-merge-jobs.yml1
-rw-r--r--jjb/daisy4nfv/daisy4nfv-verify-jobs.yml5
3 files changed, 6 insertions, 2 deletions
diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml
index fd0da7928..09b0bc2e1 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: