X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-ci-jobs.yml;h=2a82481861cdfc43029ca02d62861fdd88f9763a;hb=97b26e5d26a59d2f0dd520b088cc68741fec55d7;hp=0f760c4cc59e53ee1d135bf5824e3d9e9e1d8041;hpb=5ddd16d41e6bd92a0849577807b177f52ba1ec20;p=releng.git

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 0f760c4cc..2a8248186 100644
--- 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':
@@ -40,9 +44,9 @@
         - '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,8 +58,6 @@
 - job-template:
     name: 'compass-{scenario}-{pod}-daily-{stream}'
 
-    project-type: multijob
-
     node: huawei-build
 
     concurrent: false
@@ -73,6 +75,9 @@
     wrappers:
         - build-name:
             name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+        - timeout:
+            timeout: 360
+            fail: true
 
     parameters:
         - project-parameter:
@@ -83,37 +88,42 @@
         - 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}'
@@ -162,7 +172,7 @@
         - shell:
             !include-raw: ./compass-download-artifact.sh
         - shell:
-            !include-raw: ./compass-deploy-bare.sh
+            !include-raw: ./compass-deploy.sh
 
     publishers:
         - archive:
@@ -180,20 +190,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:
@@ -204,22 +204,31 @@
             choices:
                 - 'trusty'
                 - 'centos7'
-
+- parameter:
+    name: 'huawei-virtual-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'huawei-deploy-vm'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on these Jenkins Slaves'
 ########################
 # trigger macros
 ########################
 - 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: ''
+        - timed: '0 20 * * *'
 - 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:
@@ -231,7 +240,7 @@
 - trigger:
     name: 'compass-os-odl_l2-nofeature-ha-intel-pod8-trigger'
     triggers:
-        - timed: '0 16 * * *'
+        - timed: ''
 - trigger:
     name: 'compass-os-onos-nofeature-ha-intel-pod8-trigger'
     triggers:
@@ -240,3 +249,19 @@
     name: 'compass-os-ocl-nofeature-ha-intel-pod8-trigger'
     triggers:
         - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-trigger'
+    triggers:
+        - timed: '0 16 * * *'
+- trigger:
+    name: 'compass-os-onos-nofeature-ha-huawei-virtual-trigger'
+    triggers:
+        - timed: '0 16 * * *'
+- trigger:
+    name: 'compass-os-ocl-nofeature-ha-huawei-virtual-trigger'
+    triggers:
+        - timed: ''