X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fjoid%2Fjoid-daily-jobs.yml;h=2719c7292f6718cec40b947374eb571b7ca6f57e;hb=4be3e4a21b161c2602ececefe8ff11114a9348f5;hp=b28efc3b3774347b6c5c0da8e9f9d7b24173e030;hpb=8e72b68b83fac5417fe78a3a9f3b416b72aca129;p=releng.git

diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml
index b28efc3b3..2719c7292 100644
--- a/jjb/joid/joid-daily-jobs.yml
+++ b/jjb/joid/joid-daily-jobs.yml
@@ -13,11 +13,16 @@
     # -------------------------------
     # BRANCH ANCHORS
     # -------------------------------
-    euphrates: &euphrates
-        stream: euphrates
-        branch: 'stable/{stream}'
-        disabled: false
-        gs-pathname: '/{stream}'
+    fraser: &fraser
+      stream: fraser
+      branch: 'stable/{stream}'
+      disabled: false
+      gs-pathname: '/{stream}'
+    master: &master
+      stream: master
+      branch: '{stream}'
+      disabled: false
+      gs-pathname: ''
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
@@ -26,8 +31,10 @@
     pod:
       - baremetal:
           slave-label: joid-baremetal
-          <<: *euphrates
-
+          <<: *fraser
+      - baremetal:
+          slave-label: joid-baremetal
+          <<: *master
     # -------------------------------
     # scenarios
     # -------------------------------
@@ -56,6 +63,14 @@
           auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
       - 'os-nosdn-openbaton-ha':
           auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+      - 'k8-canal-lb-noha':
+          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+      - 'k8-nosdn-lb_ceph-noha':
+          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+      - 'k8-multus-lb-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+      - 'os-ovn-nofeature-ha':
+          auto-trigger-name: 'daily-trigger-disabled'
 
     jobs:
       - 'joid-{scenario}-{pod}-daily-{stream}'
@@ -81,7 +96,7 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'joid-os-.*?-{pod}-daily-.*'
+            - 'joid-(os|k8)-.*?-{pod}-daily-.*'
           block-level: 'NODE'
 
     wrappers:
@@ -217,58 +232,153 @@
 ########################
 # trigger macros
 ########################
-# os-nosdn-nofeature-ha trigger - branch: euphrates
+# os-nosdn-nofeature-ha trigger - branch: fraser
 - trigger:
-    name: 'joid-os-nosdn-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'joid-os-nosdn-nofeature-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '5 2 * * *'
-# os-odl_l2-nofeature-ha trigger - branch: euphrates
+# os-nosdn-nofeature-ha trigger - branch: master
 - trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'joid-os-nosdn-nofeature-ha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 2 * * *'
+# os-odl_l2-nofeature-ha trigger - branch: fraser
+- trigger:
+    name: 'joid-os-odl_l2-nofeature-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '5 7 * * *'
-# os-nosdn-lxd-noha trigger - branch: euphrates
+# os-odl_l2-nofeature-ha trigger - branch: master
+- trigger:
+    name: 'joid-os-odl_l2-nofeature-ha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 7 * * *'
+# os-nosdn-lxd-noha trigger - branch: fraser
+- trigger:
+    name: 'joid-os-nosdn-lxd-noha-baremetal-fraser-trigger'
+    triggers:
+      - timed: '5 22 * * *'
+# os-nosdn-lxd-noha trigger - branch: master
 - trigger:
-    name: 'joid-os-nosdn-lxd-noha-baremetal-euphrates-trigger'
+    name: 'joid-os-nosdn-lxd-noha-baremetal-master-trigger'
     triggers:
       - timed: '5 22 * * *'
-# os-nosdn-lxd-ha trigger - branch: euphrates
+# os-nosdn-lxd-ha trigger - branch: fraser
 - trigger:
-    name: 'joid-os-nosdn-lxd-ha-baremetal-euphrates-trigger'
+    name: 'joid-os-nosdn-lxd-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '5 10 * * *'
-# os-nosdn-nofeature-noha trigger - branch: euphrates
+# os-nosdn-lxd-ha trigger - branch: master
+- trigger:
+    name: 'joid-os-nosdn-lxd-ha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 10 * * *'
+# os-nosdn-nofeature-noha trigger - branch: fraser
+- trigger:
+    name: 'joid-os-nosdn-nofeature-noha-baremetal-fraser-trigger'
+    triggers:
+      - timed: '5 4 * * *'
+# os-nosdn-nofeature-noha trigger - branch: master
 - trigger:
-    name: 'joid-os-nosdn-nofeature-noha-baremetal-euphrates-trigger'
+    name: 'joid-os-nosdn-nofeature-noha-baremetal-master-trigger'
     triggers:
       - timed: '5 4 * * *'
-# k8-nosdn-nofeature-noha trigger - branch: euphrates
+# k8-nosdn-nofeature-noha trigger - branch: fraser
+- trigger:
+    name: 'joid-k8-nosdn-nofeature-noha-baremetal-fraser-trigger'
+    triggers:
+      - timed: '5 15 * * *'
+# k8-nosdn-nofeature-noha trigger - branch: master
 - trigger:
-    name: 'joid-k8-nosdn-nofeature-noha-baremetal-euphrates-trigger'
+    name: 'joid-k8-nosdn-nofeature-noha-baremetal-master-trigger'
     triggers:
       - timed: '5 15 * * *'
-# k8-nosdn-lb-noha trigger - branch: euphrates
+# k8-nosdn-lb-noha trigger - branch: fraser
+- trigger:
+    name: 'joid-k8-nosdn-lb-noha-baremetal-fraser-trigger'
+    triggers:
+      - timed: '5 20 * * *'
+# k8-nosdn-lb-noha trigger - branch: master
 - trigger:
-    name: 'joid-k8-nosdn-lb-noha-baremetal-euphrates-trigger'
+    name: 'joid-k8-nosdn-lb-noha-baremetal-master-trigger'
     triggers:
       - timed: '5 20 * * *'
-# k8-ovn-lb-noha trigger - branch: euphrates
+# k8-ovn-lb-noha trigger - branch: fraser
 - trigger:
-    name: 'joid-k8-ovn-lb-noha-baremetal-euphrates-trigger'
+    name: 'joid-k8-ovn-lb-noha-baremetal-fraser-trigger'
     triggers:
       - timed: '5 17 * * *'
-# os-nosdn-openbaton-ha trigger - branch: euphrates
+# k8-ovn-lb-noha trigger - branch: master
 - trigger:
-    name: 'joid-os-nosdn-openbaton-ha-baremetal-euphrates-trigger'
+    name: 'joid-k8-ovn-lb-noha-baremetal-master-trigger'
     triggers:
-      - timed: '5 25 * * *'
-# os-ocl-nofeature-ha trigger - branch: euphrates
+      - timed: '5 17 * * *'
+# os-nosdn-openbaton-ha trigger - branch: fraser
+- trigger:
+    name: 'joid-os-nosdn-openbaton-ha-baremetal-fraser-trigger'
+    triggers:
+      - timed: ''  # Disabled as there is no branch for orchestra
+# os-nosdn-openbaton-ha trigger - branch: master
 - trigger:
-    name: 'joid-os-ocl-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'joid-os-nosdn-openbaton-ha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 23 * * *'
+# os-ocl-nofeature-ha trigger - branch: fraser
+- trigger:
+    name: 'joid-os-ocl-nofeature-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '5 13 * * *'
-# os-ocl-nofeature-ha trigger - branch: euphrates
+# os-ocl-nofeature-ha trigger - branch: master
 - trigger:
-    name: 'joid-os-ocl-nofeature-noha-baremetal-euphrates-trigger'
+    name: 'joid-os-ocl-nofeature-ha-baremetal-master-trigger'
     triggers:
-      - timed: '5 17 * * *'
+      - timed: '5 13 * * *'
+# os-ocl-nofeature-noha trigger - branch: fraser
+- trigger:
+    name: 'joid-os-ocl-nofeature-noha-baremetal-fraser-trigger'
+    triggers:
+      - timed: '5 16 * * *'
+# os-ocl-nofeature-noha trigger - branch: master
+- trigger:
+    name: 'joid-os-ocl-nofeature-noha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 16 * * *'
+# k8-canal-lb-noha trigger - branch: fraser
+- trigger:
+    name: 'joid-k8-canal-lb-noha-baremetal-fraser-trigger'
+    triggers:
+      - timed: '5 14 * * *'
+# k8-canal-lb-noha trigger - branch: master
+- trigger:
+    name: 'joid-k8-canal-lb-noha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 14 * * *'
+# k8-multus-lb-noha trigger - branch: fraser
+- trigger:
+    name: 'joid-k8-multus-lb-noha-baremetal-fraser-trigger'
+    triggers:
+      - timed: '5 18 * * *'
+# k8-multus-lb-noha trigger - branch: master
+- trigger:
+    name: 'joid-k8-multus-lb-noha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 18 * * *'
+# k8-nosdn-lb_ceph-noha trigger - branch: fraser
+- trigger:
+    name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-fraser-trigger'
+    triggers:
+      - timed: '5 18 * * *'
+# k8-nosdn-lb_ceph-noha trigger - branch: master
+- trigger:
+    name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 18 * * *'
+# os-ovn-nofeature-ha trigger - branch: fraser
+- trigger:
+    name: 'joid-os-ovn-nofeature-ha-baremetal-fraser-trigger'
+    triggers:
+      - timed: '5 19 * * *'
+# os-ovn-nofeature-ha trigger - branch: master
+- trigger:
+    name: 'joid-os-ovn-nofeature-ha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 19 * * *'