Enable daisy HA deployment job

[releng.git] / jjb / daisy4nfv / daisy-daily-jobs.yml

diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index c5d8e7e..6524d20 100644 (file)
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -45,6 +45,12 @@
         # NOHA scenarios
         - 'os-nosdn-nofeature-noha':
             auto-trigger-name: 'daisy-{scenario}-{pod}-daily-{stream}-trigger'
+        # ODL_L3 scenarios
+        - 'os-odl_l3-nofeature-ha':
+            auto-trigger-name: 'daisy-{scenario}-{pod}-daily-{stream}-trigger'
+        # ODL_L2 scenarios
+        - 'os-odl_l2-nofeature-ha':
+            auto-trigger-name: 'daisy-{scenario}-{pod}-daily-{stream}-trigger'
 
     jobs:
         - '{project}-{scenario}-{pod}-daily-{stream}'
@@ -71,7 +77,6 @@
             use-build-blocker: true
             blocking-jobs:
                 - 'daisy-daily-.*'
-                - 'daisy4nfv-(merge|verify)-.*'
             block-level: 'NODE'
 
     wrappers:
@@ -179,22 +184,42 @@
 - trigger:
     name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-master-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 12 * * *'
 # NOHA Scenarios
 - trigger:
     name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-master-trigger'
     triggers:
         - timed: ''
+# ODL_L3 Scenarios
+- trigger:
+    name: 'daisy-os-odl_l3-nofeature-ha-baremetal-daily-master-trigger'
+    triggers:
+        - timed: '0 16 * * *'
+# ODL_L2 Scenarios
+- trigger:
+    name: 'daisy-os-odl_l2-nofeature-ha-baremetal-daily-master-trigger'
+    triggers:
+        - timed: ''
 #-----------------------------------------------
 # Triggers for job running on daisy-virtual against master branch
 #-----------------------------------------------
 - trigger:
     name: 'daisy-os-nosdn-nofeature-ha-virtual-daily-master-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 12 * * *'
 # NOHA Scenarios
 - trigger:
     name: 'daisy-os-nosdn-nofeature-noha-virtual-daily-master-trigger'
     triggers:
-        - timed: 'H 8,22 * * *'
+        - timed: ''
+# ODL_L3 Scenarios
+- trigger:
+    name: 'daisy-os-odl_l3-nofeature-ha-virtual-daily-master-trigger'
+    triggers:
+        - timed: '0 16 * * *'
+# ODL_L3 Scenarios
+- trigger:
+    name: 'daisy-os-odl_l2-nofeature-ha-virtual-daily-master-trigger'
+    triggers:
+        - timed: ''