X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fjoid%2Fjoid-ci-jobs.yml;h=6927ad99cc7b88291738651148977b0f73d1bc4a;hb=e7d7573b9bc086783b6067d5b394e4e1d4de5933;hp=8023d4ba6b13714059d7199f351e5f2e1cc43a21;hpb=cdd746c585e6f651a178181322f97a1e1638104c;p=releng.git

diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index 8023d4ba6..6927ad99c 100644
--- a/jjb/joid/joid-ci-jobs.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -23,39 +23,56 @@
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
-#        brahmaputra
+#        CI PODs
 #--------------------------------
     pod:
-        - intel-pod5:
+        - baremetal:
+            slave-label: joid-baremetal
+            <<: *master
+        - virtual:
+            slave-label: joid-virtual
+            <<: *master
+        - baremetal:
+            slave-label: joid-baremetal
+            <<: *brahmaputra
+        - virtual:
+            slave-label: joid-virtual
             <<: *brahmaputra
 #--------------------------------
-#           master
+#        None-CI PODs
 #--------------------------------
-        - intel-pod6:
-            <<: *master
         - orange-pod2:
+            slave-label: orange-pod2
+            <<: *brahmaputra
+        - orange-pod2:
+            slave-label: orange-pod2
             <<: *master
         - juniper-pod1:
+            slave-label: juniper-pod1
             <<: *master
 #--------------------------------
 # new scenario descriptions
     scenario:
         - 'os-nosdn-nofeature-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'daily-trigger-disabled'
         - 'os-nosdn-nofeature-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+        - 'os-nosdn-lxd-ha':
+            auto-trigger-name: 'daily-trigger-disabled'
+        - 'os-nosdn-lxd-noha':
+            auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
         - 'os-odl_l2-nofeature-ha':
-            auto-trigger-name: 'joid-{scenario}-{pod}-trigger'
-        - 'os-odl_l2-nofeature-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
         - 'os-onos-nofeature-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+        - 'os-odl_l2-nofeature-noha':
+            auto-trigger-name: 'daily-trigger-disabled'
         - 'os-onos-nofeature-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'daily-trigger-disabled'
         - 'os-ocl-nofeature-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'daily-trigger-disabled'
         - 'os-ocl-nofeature-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'daily-trigger-disabled'
 
     jobs:
         - 'joid-{scenario}-{pod}-daily-{stream}'
@@ -67,21 +84,19 @@
 - job-template:
     name: 'joid-{scenario}-{pod}-daily-{stream}'
 
-    project-type: multijob
-
-    node: intel-build
-
     concurrent: false
 
     properties:
         - throttle:
             enabled: true
-            max-total: 1
+            max-total: 4
             max-per-node: 1
+            option: 'project'
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
                 - 'joid-os-.*?-{pod}-daily-{stream}'
+            block-level: 'NODE'
 
     wrappers:
         - build-name:
@@ -94,51 +109,59 @@
         - project-parameter:
             project: '{project}'
         - '{installer}-defaults'
-        - '{pod}-defaults'
+        - '{slave-label}-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: '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'
+        - trigger-builds:
+            - project: 'functest-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}'
 
-    concurrent: false
+    concurrent: true
 
     properties:
         - throttle:
             enabled: true
-            max-total: 1
+            max-total: 4
             max-per-node: 1
+            option: 'project'
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
                 - 'joid-deploy-{pod}-daily-{stream}'
+            block-level: 'NODE'
 
     wrappers:
         - build-name:
@@ -151,7 +174,11 @@
         - project-parameter:
             project: '{project}'
         - '{installer}-defaults'
-        - '{pod}-defaults'
+        - '{slave-label}-defaults':
+            installer: '{installer}'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-nofeature-ha'
 
     scm:
         - git-scm:
@@ -161,7 +188,6 @@
 
     builders:
         - 'builder-macro'
-
 ########################
 # builder macros
 ########################
@@ -181,19 +207,182 @@
 ########################
 # trigger macros
 ########################
+# os-nosdn-nofeature-ha trigger - branch: master
 - trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-intel-pod5-trigger'
+    name: 'joid-os-nosdn-nofeature-ha-baremetal-master-trigger'
     triggers:
         - timed: '0 2 * * *'
 - trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-intel-pod6-trigger'
+    name: 'joid-os-nosdn-nofeature-ha-virtual-master-trigger'
     triggers:
-        - timed: '0 2 * * *'
+        - timed: ''
+- trigger:
+    name: 'joid-os-nosdn-nofeature-ha-orange-pod2-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-nosdn-nofeature-ha-juniper-pod1-master-trigger'
+    triggers:
+        - timed: ''
+
+# os-nosdn-nofeature-ha trigger - branch: stable/brahmaputra
+- trigger:
+    name: 'joid-os-nosdn-nofeature-ha-baremetal-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-nosdn-nofeature-ha-orange-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-nosdn-nofeature-ha-juniper-pod1-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+
+# os-odl_l2-nofeature-ha trigger - branch: master
+- trigger:
+    name: 'joid-os-odl_l2-nofeature-ha-baremetal-master-trigger'
+    triggers:
+        - timed: '0 10 * * *'
+- trigger:
+    name: 'joid-os-odl_l2-nofeature-ha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-odl_l2-nofeature-ha-orange-pod2-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-master-trigger'
+    triggers:
+        - timed: ''
+
+# os-odl_l2-nofeature-ha trigger - branch: stable/brahmaputra
+- trigger:
+    name: 'joid-os-odl_l2-nofeature-ha-baremetal-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-odl_l2-nofeature-ha-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-odl_l2-nofeature-ha-orange-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+
+# os-onos-nofeature-ha trigger - branch: master
+- trigger:
+    name: 'joid-os-onos-nofeature-ha-baremetal-master-trigger'
+    triggers:
+        - timed: '0 18 * * *'
+- trigger:
+    name: 'joid-os-onos-nofeature-ha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-onos-nofeature-ha-orange-pod2-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-onos-nofeature-ha-juniper-pod1-master-trigger'
+    triggers:
+        - timed: ''
+
+# os-onos-nofeature-ha trigger - branch: stable/brahmaputra
+- trigger:
+    name: 'joid-os-onos-nofeature-ha-baremetal-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-onos-nofeature-ha-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-onos-nofeature-ha-orange-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-onos-nofeature-ha-juniper-pod1-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+
+# os-nosdn-lxd-noha trigger - branch: master
+- trigger:
+    name: 'joid-os-nosdn-lxd-noha-baremetal-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-nosdn-lxd-noha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-nosdn-lxd-noha-orange-pod2-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-nosdn-lxd-noha-juniper-pod1-master-trigger'
+    triggers:
+        - timed: ''
+
+# os-nosdn-lxd-noha trigger - branch: stable/brahmaputra
+- trigger:
+    name: 'joid-os-nosdn-lxd-noha-baremetal-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-nosdn-lxd-noha-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-nosdn-lxd-noha-orange-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-nosdn-lxd-noha-juniper-pod1-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+
+# os-nosdn-lxd-ha trigger - branch: master
+- trigger:
+    name: 'joid-os-nosdn-lxd-ha-baremetal-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-nosdn-lxd-ha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-nosdn-lxd-ha-orange-pod2-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-nosdn-lxd-ha-juniper-pod1-master-trigger'
+    triggers:
+        - timed: ''
+
+# os-nosdn-lxd-ha trigger - branch: stable/brahmaputra
+- trigger:
+    name: 'joid-os-nosdn-lxd-ha-baremetal-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-nosdn-lxd-ha-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
 - trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-orange-pod2-trigger'
+    name: 'joid-os-nosdn-lxd-ha-orange-pod2-brahmaputra-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-trigger'
+    name: 'joid-os-nosdn-lxd-ha-juniper-pod1-brahmaputra-trigger'
     triggers:
         - timed: ''