[compass] adjust concurrency of ci daily jobs

Change-Id: I1d9c9b8f9488d3c4480e4dd5f1a164a198d4995e
Signed-off-by: meimei <meimei@huawei.com>

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 11fac7c..eb9f58a 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -58,15 +58,18 @@
 - job-template:
     name: 'compass-{scenario}-{pod}-daily-{stream}'
 
-    node: huawei-build
-
-    concurrent: false
+    concurrent: true
 
     properties:
         - throttle:
             enabled: true
-            max-total: 0
             max-per-node: 1
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'compass-os-.*?-{pod}-daily-.*?'
+                - 'compass-verify-[^-]*'
+            block-level: 'NODE'
 
     wrappers:
         - build-name:
@@ -131,12 +134,13 @@
     properties:
         - throttle:
             enabled: true
-            max-total: 0
             max-per-node: 1
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - 'compass-deploy-{pod}-daily-{stream}'
+                - 'compass-deploy-{pod}-daily-.*?'
+                - 'compass-verify-deploy-.*?'
+            block-level: 'NODE'
 
     wrappers:
         - build-name:

diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index ea978d4..25ea676 100644 (file)
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -42,8 +42,13 @@
     properties:
         - throttle:
             enabled: true
-            max-total: 4
             max-per-node: 1
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'compass-verify-[^-]*'
+                - 'compass-os-.*?-virtual-daily-.*?'
+            block-level: 'NODE'
 
     parameters:
         - project-parameter:
@@ -96,8 +101,12 @@
     properties:
         - throttle:
             enabled: true
-            max-total: 0
             max-per-node: 1
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'compass-deploy-huawei-virtual-daily-.*?'
+            block-level: 'NODE'
 
     scm:
         - gerrit-trigger-scm: