X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-ci-jobs.yml;h=c9560a572ca8c3378d28d6ee69856bbfe784e3fd;hb=b2628f46a2abe65c8aea4e8c527148ab5bfa3ba0;hp=f68597e3acd731feb55f6d313f001cc01b376ee0;hpb=41d070923da637ec588998017e9c41347891ba2d;p=releng.git

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index f68597e3a..c9560a572 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -23,48 +23,67 @@
 #        brahmaputra
 #--------------------------------
         - huawei-us-deploy-bare-1:
+            os-version: 'trusty'
+            <<: *brahmaputra
+        - huawei-virtual:
+            os-version: 'trusty'
             <<: *brahmaputra
 #--------------------------------
 #        master
 #--------------------------------
+        - huawei-us-deploy-bare-2:
+            os-version: 'centos7'
+            <<: *master
         - intel-pod8:
+            os-version: 'trusty'
+            <<: *master
+        - huawei-virtual:
+            os-version: 'trusty'
             <<: *master
 
-    sdn-controller:
-        - 'nosdn':
+    scenario:
+        - 'os-nosdn-nofeature-ha':
+            disabled: false
+            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+        - 'os-odl_l2-nofeature-ha':
             disabled: false
-        - 'odl':
+            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+        - 'os-odl_l3-nofeature-ha':
             disabled: false
-        - 'onos':
+            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+        - 'os-onos-nofeature-ha':
             disabled: false
-#        - 'opencontrail':
-#            disabled: true
+            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+        - 'os-ocl-nofeature-ha':
+            disabled: false
+            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
 
     jobs:
-        - 'compass-{sdn-controller}-{pod}-daily-{stream}'
+        - 'compass-{scenario}-{pod}-daily-{stream}'
         - 'compass-deploy-{pod}-daily-{stream}'
 
 ########################
 # job templates
 ########################
 - job-template:
-    name: 'compass-{sdn-controller}-{pod}-daily-{stream}'
-
-    project-type: multijob
-
-    node: huawei-build
+    name: 'compass-{scenario}-{pod}-daily-{stream}'
 
     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-.*?'
+                - 'compass-verify-[^-]*'
+            block-level: 'NODE'
 
     wrappers:
         - build-name:
-            name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Scenario: $DEPLOY_SCENARIO'
+            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
 
     parameters:
         - project-parameter:
@@ -72,48 +91,46 @@
         - compass-ci-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
-        - string:
-            name: SDN_CONTROLLER
-            default: '{sdn-controller}'
         - string:
             name: DEPLOY_SCENARIO
-            default: 'none'
-        - 'huawei-build-defaults'
+            default: '{scenario}'
+        - '{pod}-defaults'
         - '{installer}-defaults'
 
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
-
     triggers:
-        - 'compass-{pod}-{sdn-controller}-trigger'
+        - '{auto-trigger-name}'
 
     builders:
-        - multijob:
-            name: deploy
-            condition: SUCCESSFUL
-            projects:
-                - name: 'compass-deploy-{pod}-daily-{stream}'
-                  current-parameters: false
-                  git-revision: true
-                  kill-phase-on: FAILURE
-        - multijob:
-            name: functest
-            condition: COMPLETED
-            projects:
-                - name: 'functest-compass-{pod}-daily-{stream}'
-                  current-parameters: false
-                  kill-phase-on: NEVER
-        - multijob:
-            name: yardstick
-            condition: COMPLETED
-            projects:
-                - name: 'yardstick-compass-{pod}-daily-{stream}'
-                  current-parameters: false
-                  kill-phase-on: NEVER
+        - trigger-builds:
+            - project: 'compass-deploy-{pod}-daily-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                DEPLOY_SCENARIO={scenario}
+                COMPASS_OS_VERSION={os-version}
+              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}'
@@ -125,8 +142,20 @@
     properties:
         - throttle:
             enabled: true
-            max-total: 1
             max-per-node: 1
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - '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:
@@ -134,12 +163,6 @@
         - compass-ci-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
-        - string:
-            name: SDN_CONTROLLER
-            default: '{sdn-controller}'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'none'
         - '{pod}-defaults'
         - '{installer}-defaults'
 
@@ -151,16 +174,14 @@
 
     wrappers:
         - build-name:
-            name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Scenario: $DEPLOY_SCENARIO'
+            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
 
 
     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:
@@ -178,63 +199,96 @@
             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:
                 - 'liberty'
                 - 'juno'
-        - choice:
-            name: COMPASS_OS_VERSION
-            choices:
-                - 'trusty'
-                - 'centos7'
 
 ########################
 # trigger macros
 ########################
 - trigger:
-    name: 'compass-huawei-us-deploy-bare-1-nosdn-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-huawei-us-deploy-bare-2-trigger'
     triggers:
-        - timed: '0 16 * * * '
+        - timed: '0 3 * * *'
 - trigger:
-    name: 'compass-huawei-us-deploy-bare-1-odl-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-huawei-us-deploy-bare-2-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 21 * * *'
 - trigger:
-    name: 'compass-huawei-us-deploy-bare-1-onos-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-huawei-us-deploy-bare-2-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-huawei-us-deploy-bare-1-opencontrail-trigger'
+    name: 'compass-os-onos-nofeature-ha-huawei-us-deploy-bare-2-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 15 * * *'
+- trigger:
+    name: 'compass-os-ocl-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+    triggers:
+        - timed: '0 9 * * *'
+- trigger:
+    name: 'compass-os-nosdn-nofeature-ha-huawei-us-deploy-bare-1-trigger'
+    triggers:
+        - timed: '0 3 * * * '
 - trigger:
-    name: 'compass-intel-pod8-nosdn-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-intel-pod8-odl-trigger'
+    name: 'compass-os-onos-nofeature-ha-huawei-us-deploy-bare-1-trigger'
+    triggers:
+        - timed: '0 15 * * *'
+- trigger:
+    name: 'compass-os-ocl-nofeature-ha-huawei-us-deploy-bare-1-trigger'
     triggers:
-        - timed: '0 16 * * *'
+        - timed: '0 9 * * *'
 - trigger:
-    name: 'compass-intel-pod8-onos-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-intel-pod8-trigger'
+    triggers:
+        - 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-intel-pod8-opencontrail-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 * * *'