X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fjoid%2Fjoid-ci-jobs.yml;h=909a885ab5dfec21bb62d95b0a18e761a03b826d;hb=7d07e223f5a5ff18de1bc83377b7be345a2ef01f;hp=8023d4ba6b13714059d7199f351e5f2e1cc43a21;hpb=d6297d731df4ee327e91cb523b8dd1395098043d;p=releng.git

diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index 8023d4ba6..909a885ab 100644
--- a/jjb/joid/joid-ci-jobs.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -28,6 +28,8 @@
     pod:
         - intel-pod5:
             <<: *brahmaputra
+        - virtual:
+            <<: *brahmaputra
 #--------------------------------
 #           master
 #--------------------------------
@@ -37,6 +39,8 @@
             <<: *master
         - juniper-pod1:
             <<: *master
+        - virtual:
+            <<: *master
 #--------------------------------
 # new scenario descriptions
     scenario:
@@ -49,7 +53,7 @@
         - 'os-odl_l2-nofeature-noha':
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-onos-nofeature-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'joid-{scenario}-{pod}-trigger'
         - 'os-onos-nofeature-noha':
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-ocl-nofeature-ha':
@@ -67,10 +71,6 @@
 - job-template:
     name: 'joid-{scenario}-{pod}-daily-{stream}'
 
-    project-type: multijob
-
-    node: intel-build
-
     concurrent: false
 
     properties:
@@ -94,36 +94,42 @@
         - project-parameter:
             project: '{project}'
         - '{installer}-defaults'
-        - '{pod}-defaults'
+        - '{pod}-defaults':
+            installer: '{installer}'
         - string:
             name: DEPLOY_SCENARIO
             default: '{scenario}'
 
     builders:
-        - multijob:
-            name: deploy
-            condition: SUCCESSFUL
-            projects:
-                - name: 'joid-deploy-{pod}-daily-{stream}'
-                  current-parameters: false
-                  predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
-                  kill-phase-on: FAILURE
-        - multijob:
-            name: functest
-            condition: COMPLETED
-            projects:
-                - name: 'functest-joid-{pod}-daily-{stream}'
-                  current-parameters: false
-                  predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
-                  kill-phase-on: NEVER
-        - multijob:
-            name: yardstick
-            condition: COMPLETED
-            projects:
-                - name: 'yardstick-joid-{pod}-daily-{stream}'
-                  current-parameters: false
-                  predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
-                  kill-phase-on: NEVER
+        - trigger-builds:
+            - project: 'joid-deploy-{pod}-daily-{stream}'
+              current-parameters: true
+              predefined-parameters:
+                DEPLOY_SCENARIO={scenario}
+              same-node: true
+              block: true
+        - trigger-builds:
+            - project: 'functest-joid-{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-joid-{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: 'joid-deploy-{pod}-daily-{stream}'
@@ -151,7 +157,11 @@
         - project-parameter:
             project: '{project}'
         - '{installer}-defaults'
-        - '{pod}-defaults'
+        - '{pod}-defaults':
+            installer: '{installer}'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-nofeature-ha'
 
     scm:
         - git-scm:
@@ -161,7 +171,6 @@
 
     builders:
         - 'builder-macro'
-
 ########################
 # builder macros
 ########################
@@ -197,3 +206,27 @@
     name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-trigger'
     triggers:
         - timed: ''
+- trigger:
+    name: 'joid-os-odl_l2-nofeature-ha-virtual-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-onos-nofeature-ha-intel-pod5-trigger'
+    triggers:
+        - timed: '0 14 * * *'
+- trigger:
+    name: 'joid-os-onos-nofeature-ha-intel-pod6-trigger'
+    triggers:
+        - timed: '0 14 * * *'
+- trigger:
+    name: 'joid-os-onos-nofeature-ha-orange-pod2-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-onos-nofeature-ha-juniper-pod1-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-onos-nofeature-ha-virtual-trigger'
+    triggers:
+        - timed: ''