X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdaisy4nfv%2Fdaisy-daily-jobs.yml;h=237861dba4fd731333ad2908a973d6abc96b5f9b;hb=0f11af67383f2e3943b752018c25aeaba4a728a8;hp=ffae70f8fa69b97be784bbc595a9dd12a784db95;hpb=512c71b637b3b07cf184383a539fcaf87e245c94;p=releng.git

diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index ffae70f8f..237861dba 100644
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -19,21 +19,36 @@
         branch: '{stream}'
         disabled: false
         gs-pathname: ''
+    euphrates: &euphrates
+        stream: euphrates
+        branch: 'stable/{stream}'
+        gs-pathname: '/{stream}'
+        disabled: false
+
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
 #        CI PODs
 #--------------------------------
     pod:
+#        - baremetal:
+#            slave-label: daisy-baremetal
+#            <<: *master
+        - virtual:
+            slave-label: daisy-virtual
+            <<: *master
         - baremetal:
             slave-label: daisy-baremetal
-            <<: *master
+            <<: *euphrates
         - virtual:
             slave-label: daisy-virtual
-            <<: *master
+            <<: *euphrates
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
+        - baremetal:
+            slave-label: zte-pod3
+            <<: *master
 
 #--------------------------------
 #       scenarios
@@ -45,6 +60,9 @@
         # NOHA scenarios
         - 'os-nosdn-nofeature-noha':
             auto-trigger-name: 'daisy-{scenario}-{pod}-daily-{stream}-trigger'
+        # ODL_L3 scenarios
+        - 'os-odl-nofeature-ha':
+            auto-trigger-name: 'daisy-{scenario}-{pod}-daily-{stream}-trigger'
 
     jobs:
         - '{project}-{scenario}-{pod}-daily-{stream}'
@@ -70,7 +88,7 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - 'daisy.*-deploy-({pod})?-daily-.*'
+                - 'daisy-daily-.*'
             block-level: 'NODE'
 
     wrappers:
@@ -174,26 +192,73 @@
 #-----------------------------------------------
 # Triggers for job running on daisy-baremetal against master branch
 #-----------------------------------------------
-# HA Scenarios
+# Basic HA Scenarios
 - trigger:
     name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-master-trigger'
     triggers:
-        - timed: ''
-# NOHA Scenarios
+        - timed: '0 16 * * *'
+# Basic NOHA Scenarios
 - trigger:
     name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-master-trigger'
     triggers:
         - timed: ''
+# ODL Scenarios
+- trigger:
+    name: 'daisy-os-odl-nofeature-ha-baremetal-daily-master-trigger'
+    triggers:
+        - timed: '0 12 * * *'
 #-----------------------------------------------
 # Triggers for job running on daisy-virtual against master branch
 #-----------------------------------------------
+# Basic HA Scenarios
 - trigger:
     name: 'daisy-os-nosdn-nofeature-ha-virtual-daily-master-trigger'
     triggers:
-        - timed: ''
-# NOHA Scenarios
+        - timed: '0 16 * * *'
+# Basic NOHA Scenarios
 - trigger:
     name: 'daisy-os-nosdn-nofeature-noha-virtual-daily-master-trigger'
     triggers:
-        - timed: 'H 8,22 * * *'
+        - timed: ''
+# ODL Scenarios
+- trigger:
+    name: 'daisy-os-odl-nofeature-ha-virtual-daily-master-trigger'
+    triggers:
+        - timed: '0 12 * * *'
 
+#-----------------------------------------------
+# Triggers for job running on daisy-baremetal against euphrates branch
+#-----------------------------------------------
+# Basic HA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-euphrates-trigger'
+    triggers:
+        - timed: '0 0 * * *'
+# Basic NOHA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-euphrates-trigger'
+    triggers:
+        - timed: ''
+# ODL Scenarios
+- trigger:
+    name: 'daisy-os-odl-nofeature-ha-baremetal-daily-euphrates-trigger'
+    triggers:
+        - timed: '0 20 * * *'
+#-----------------------------------------------
+# Triggers for job running on daisy-virtual against euphrates branch
+#-----------------------------------------------
+# Basic HA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-ha-virtual-daily-euphrates-trigger'
+    triggers:
+        - timed: '0 0 * * *'
+# Basic NOHA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-noha-virtual-daily-euphrates-trigger'
+    triggers:
+        - timed: ''
+# ODL Scenarios
+- trigger:
+    name: 'daisy-os-odl-nofeature-ha-virtual-daily-euphrates-trigger'
+    triggers:
+        - timed: '0 20 * * *'