[compass] add senario of odl_l3

[releng.git] / jjb / compass4nfv / compass-ci-jobs.yml

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index eb9f58a..b3438d7 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -41,6 +41,9 @@
         - 'os-odl_l2-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+        - 'os-odl_l3-nofeature-ha':
+            disabled: false
+            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
         - 'os-onos-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
@@ -74,9 +77,6 @@
     wrappers:
         - build-name:
             name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-        - timeout:
-            timeout: 360
-            fail: true
 
     parameters:
         - project-parameter:
@@ -145,6 +145,9 @@
     wrappers:
         - build-name:
             name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+        - timeout:
+            timeout: 120
+            abort: true
 
     parameters:
         - project-parameter:
@@ -168,11 +171,9 @@
 
     builders:
         - shell:
-            !include-raw: ./compass-workspace-precleanup.sh
-        - shell:
-            !include-raw: ./compass-download-artifact.sh
+            !include-raw-escape: ./compass-download-artifact.sh
         - shell:
-            !include-raw: ./compass-deploy.sh
+            !include-raw-escape: ./compass-deploy.sh
 
     publishers:
         - archive:
@@ -215,7 +216,11 @@
 - 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-odl_l3-nofeature-ha-huawei-us-deploy-bare-1-trigger'
+    triggers:
+        - timed: ''
 - trigger:
     name: 'compass-os-onos-nofeature-ha-huawei-us-deploy-bare-1-trigger'
     triggers:
@@ -223,36 +228,44 @@
 - trigger:
     name: 'compass-os-ocl-nofeature-ha-huawei-us-deploy-bare-1-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 9 * * *'
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-intel-pod8-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 3 * * *'
 - trigger:
     name: 'compass-os-odl_l2-nofeature-ha-intel-pod8-trigger'
+    triggers:
+        - timed: '0 21 * * *'
+- trigger:
+    name: 'compass-os-odl_l3-nofeature-ha-intel-pod8-trigger'
     triggers:
         - timed: ''
 - trigger:
     name: 'compass-os-onos-nofeature-ha-intel-pod8-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 15 * * *'
 - trigger:
     name: 'compass-os-ocl-nofeature-ha-intel-pod8-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 9 * * *'
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 3 * * *'
 - trigger:
     name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-trigger'
     triggers:
-        - timed: '0 16 * * *'
+        - timed: '0 21 * * *'
+- trigger:
+    name: 'compass-os-odl_l3-nofeature-ha-huawei-virtual-trigger'
+    triggers:
+        - timed: ''
 - trigger:
     name: 'compass-os-onos-nofeature-ha-huawei-virtual-trigger'
     triggers:
-        - timed: '0 16 * * *'
+        - timed: '0 15 * * *'
 - trigger:
     name: 'compass-os-ocl-nofeature-ha-huawei-virtual-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 9 * * *'