1 files changed, 20 insertions, 18 deletions

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 11fac7cc7..5564d6989 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -58,22 +58,22 @@
 - 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:
             name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-        - timeout:
-            timeout: 360
-            fail: true
 
     parameters:
         - project-parameter:
@@ -131,16 +131,20 @@
     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:
             name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+        - timeout:
+            timeout: 120
+            abort: true
 
     parameters:
         - project-parameter:
@@ -164,11 +168,9 @@
 
     builders:
         - shell:
-            !include-raw: ./compass-workspace-precleanup.sh
+            !include-raw-escape: ./compass-download-artifact.sh
         - shell:
-            !include-raw: ./compass-download-artifact.sh
-        - shell:
-            !include-raw: ./compass-deploy.sh
+            !include-raw-escape: ./compass-deploy.sh
 
     publishers:
         - archive:
@@ -207,11 +209,11 @@
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-huawei-us-deploy-bare-1-trigger'
     triggers:
-        - timed: '0 3 * * * '
+        - timed: '0 3,9 * * * '
 - trigger:
     name: 'compass-os-odl_l2-nofeature-ha-huawei-us-deploy-bare-1-trigger'
     triggers:
-        - timed: '0 20 * * *'
+        - timed: '0 21 * * *'
 - trigger:
     name: 'compass-os-onos-nofeature-ha-huawei-us-deploy-bare-1-trigger'
     triggers:
@@ -239,15 +241,15 @@
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 3,9 * * *'
 - trigger:
     name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-trigger'
     triggers:
-        - timed: '0 16 * * *'
+        - timed: '0 15,21 * * *'
 - trigger:
     name: 'compass-os-onos-nofeature-ha-huawei-virtual-trigger'
     triggers:
-        - timed: '0 16 * * *'
+        - timed: '0 15,21 * * *'
 - trigger:
     name: 'compass-os-ocl-nofeature-ha-huawei-virtual-trigger'
     triggers: