summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authormei mei <meimei@huawei.com>2016-10-21 20:00:43 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-10-21 20:00:43 +0000
commit836b207c8e2cb5fb5ba929c1147c9a02be2d68f9 (patch)
tree89665ebbcf5643450a524b42a6dda92f52d2fdc0 /jjb
parent7891b74307d0c69acf5d7a77e8393dc46b3f903b (diff)
parentaaa526ff22f1b902060483a1bddff3a12b485a51 (diff)
Merge "[compass] fix concurrency issues of ci jobs"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml2
-rw-r--r--jjb/compass4nfv/compass-project-jobs.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index da882cdfe..eb9113114 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -100,7 +100,7 @@
blocking-jobs:
- 'compass-os-.*?-{pod}-daily-.*?'
- 'compass-os-.*?-baremetal-daily-.*?'
- - 'compass-verify-[^-]*'
+ - 'compass-verify-[^-]*-[^-]*'
block-level: 'NODE'
wrappers:
diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 4d799af8e..5ce906482 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -56,7 +56,7 @@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - 'compass-verify-[^-]*'
+ - 'compass-verify-[^-]*-[^-]*'
- 'compass-os-.*?-virtual-daily-.*?'
block-level: 'NODE'