Code Review / releng.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
[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 0f760c4..b3438d7 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -24,11 +24,15 @@
 #--------------------------------
         - huawei-us-deploy-bare-1:
             <<: *brahmaputra
+        - huawei-virtual:
+            <<: *brahmaputra
 #--------------------------------
 #        master
 #--------------------------------
         - intel-pod8:
             <<: *master
+        - huawei-virtual:
+            <<: *master
 
     scenario:
         - 'os-nosdn-nofeature-ha':
@@ -37,12 +41,15 @@
         - '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'
-#        - 'os-ocl-nofeature-ha':
-#            disabled: true
-#            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+        - 'os-ocl-nofeature-ha':
+            disabled: false
+            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
 
     jobs:
         - 'compass-{scenario}-{pod}-daily-{stream}'
@@ -54,21 +61,18 @@
 - job-template:
     name: 'compass-{scenario}-{pod}-daily-{stream}'
 
-    project-type: multijob
-
-    node: huawei-build
-
-    concurrent: false
+    concurrent: true
 
     properties:
         - throttle:
             enabled: true
-            max-total: 1
             max-per-node: 1
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - 'compass-os-.*?-{pod}-daily-{stream}'
+                - 'compass-os-.*?-{pod}-daily-.*?'
+                - 'compass-verify-[^-]*'
+            block-level: 'NODE'
 
     wrappers:
         - build-name:
@@ -83,58 +87,67 @@
         - string:
             name: DEPLOY_SCENARIO
             default: '{scenario}'
-        - 'huawei-build-defaults'
+        - '{pod}-defaults'
         - '{installer}-defaults'
 
     triggers:
         - '{auto-trigger-name}'
 
     builders:
-        - multijob:
-            name: deploy
-            condition: SUCCESSFUL
-            projects:
-                - name: 'compass-deploy-{pod}-daily-{stream}'
-                  current-parameters: false
-                  predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
-                  kill-phase-on: FAILURE
-        - multijob:
-            name: functest
-            condition: COMPLETED
-            projects:
-                - name: 'functest-compass-{pod}-daily-{stream}'
-                  current-parameters: false
-                  predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
-                  kill-phase-on: NEVER
-        - multijob:
-            name: yardstick
-            condition: COMPLETED
-            projects:
-                - name: 'yardstick-compass-{pod}-daily-{stream}'
-                  current-parameters: false
-                  predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
-                  kill-phase-on: NEVER
+        - trigger-builds:
+            - project: 'compass-deploy-{pod}-daily-{stream}'
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO={scenario}
+              same-node: true
+              block: true
+        - trigger-builds:
+            - project: 'functest-compass-{pod}-daily-{stream}'
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO={scenario}
+              same-node: true
+              block: true
+              block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+            - project: 'yardstick-compass-{pod}-daily-{stream}'
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO={scenario}
+              block: true
+              same-node: true
+              block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
 
 - job-template:
     name: 'compass-deploy-{pod}-daily-{stream}'
 
     disabled: false
 
-    concurrent: false
+    concurrent: true
 
     properties:
         - throttle:
             enabled: true
-            max-total: 1
             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:
@@ -158,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-bare.sh
+            !include-raw-escape: ./compass-deploy.sh
 
     publishers:
         - archive:
@@ -180,20 +191,10 @@
             name: BUILD_DIRECTORY
             default: $WORKSPACE/build_output
             description: "Directory where the build artifact will be located upon the completion of the build."
-        - string:
-            name: CACHE_DIRECTORY
-            default: $HOME/opnfv/cache/$PROJECT
-            description: "Directory where the cache to be used during the build is located."
         - string:
             name: GS_URL
             default: '$GS_BASE{gs-pathname}'
             description: "URL to Google Storage."
-        - string:
-            name: PPA_REPO
-            default: "http://205.177.226.235:9999"
-        - string:
-            name: PPA_CACHE
-            default: "$WORKSPACE/work/repo/"
         - choice:
             name: COMPASS_OPENSTACK_VERSION
             choices:
@@ -211,32 +212,60 @@
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-huawei-us-deploy-bare-1-trigger'
     triggers:
-        - timed: '0 16 * * * '
+        - timed: '0 3 * * * '
 - trigger:
     name: 'compass-os-odl_l2-nofeature-ha-huawei-us-deploy-bare-1-trigger'
+    triggers:
+        - 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:
-        - timed: ''
+        - timed: '0 15 * * *'
 - 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 16 * * *'
+        - timed: '0 21 * * *'
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-intel-pod8-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: '0 15 * * *'
 - trigger:
     name: 'compass-os-ocl-nofeature-ha-intel-pod8-trigger'
+    triggers:
+        - timed: '0 9 * * *'
+- trigger:
+    name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-trigger'
+    triggers:
+        - timed: '0 3 * * *'
+- trigger:
+    name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-trigger'
+    triggers:
+        - 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 15 * * *'
+- trigger:
+    name: 'compass-os-ocl-nofeature-ha-huawei-virtual-trigger'
+    triggers:
+        - timed: '0 9 * * *'