X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fjoid%2Fjoid-ci-jobs.yml;h=61c1f825eb1ae8d87917b181e0dc0522f83d7491;hb=0dd57534f0818635196289daccb72ea76fe31c5d;hp=909a885ab5dfec21bb62d95b0a18e761a03b826d;hpb=28a9e274ffe85aac6d80cf00029e1d1a2f0a39f8;p=releng.git

diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index 909a885ab..61c1f825e 100644
--- a/jjb/joid/joid-ci-jobs.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -23,43 +23,58 @@
 #--------------------------------
 # 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:
-            <<: *master
-        - virtual:
+            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: 'joid-{scenario}-{pod}-trigger'
+            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-onos-sfc-ha':
+            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}'
@@ -76,12 +91,14 @@
     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,13 +111,15 @@
         - project-parameter:
             project: '{project}'
         - '{installer}-defaults'
-        - '{pod}-defaults':
+        - '{slave-label}-defaults':
             installer: '{installer}'
         - string:
             name: DEPLOY_SCENARIO
             default: '{scenario}'
 
     builders:
+        - description-setter:
+            description: "POD: $NODE_NAME"
         - trigger-builds:
             - project: 'joid-deploy-{pod}-daily-{stream}'
               current-parameters: true
@@ -113,8 +132,8 @@
               current-parameters: false
               predefined-parameters:
                 DEPLOY_SCENARIO={scenario}
-              same-node: true
               block: true
+              same-node: true
               block-thresholds:
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
@@ -134,17 +153,19 @@
 - 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:
@@ -157,7 +178,7 @@
         - project-parameter:
             project: '{project}'
         - '{installer}-defaults'
-        - '{pod}-defaults':
+        - '{slave-label}-defaults':
             installer: '{installer}'
         - string:
             name: DEPLOY_SCENARIO
@@ -170,6 +191,8 @@
             branch: '{branch}'
 
     builders:
+        - description-setter:
+            description: "POD: $NODE_NAME"
         - 'builder-macro'
 ########################
 # builder macros
@@ -190,43 +213,188 @@
 ########################
 # 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-odl_l2-nofeature-ha-orange-pod2-trigger'
+    name: 'joid-os-nosdn-nofeature-ha-orange-pod2-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-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-odl_l2-nofeature-ha-virtual-trigger'
+    name: 'joid-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-onos-nofeature-ha-intel-pod5-trigger'
+    name: 'joid-os-nosdn-nofeature-ha-orange-pod2-brahmaputra-trigger'
     triggers:
-        - timed: '0 14 * * *'
+        - timed: ''
 - trigger:
-    name: 'joid-os-onos-nofeature-ha-intel-pod6-trigger'
+    name: 'joid-os-nosdn-nofeature-ha-juniper-pod1-brahmaputra-trigger'
     triggers:
-        - timed: '0 14 * * *'
+        - 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-sfc-ha trigger - branch: master
+- trigger:
+    name: 'joid-os-onos-sfc-ha-baremetal-master-trigger'
+    triggers:
+        - timed: '0 21 * * *'
+
+# 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-onos-nofeature-ha-orange-pod2-trigger'
+    name: 'joid-os-nosdn-lxd-ha-virtual-brahmaputra-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-onos-nofeature-ha-juniper-pod1-trigger'
+    name: 'joid-os-nosdn-lxd-ha-orange-pod2-brahmaputra-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-onos-nofeature-ha-virtual-trigger'
+    name: 'joid-os-nosdn-lxd-ha-juniper-pod1-brahmaputra-trigger'
     triggers:
         - timed: ''