Merge "[compass] fix concurrency issues of ci jobs"

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index da882cd..eb91131 100644 (file)
--- 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 4d799af..5ce9064 100644 (file)
--- 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'