Adjust the schedule of daisy baremetal jobs

[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 592e54d..84cc2a4 100644 (file)
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -46,10 +46,7 @@
         - 'os-nosdn-nofeature-noha':
             auto-trigger-name: 'daisy-{scenario}-{pod}-daily-{stream}-trigger'
         # ODL_L3 scenarios
-        - 'os-odl_l3-nofeature-noha':
-            auto-trigger-name: 'daisy-{scenario}-{pod}-daily-{stream}-trigger'
-        # ODL_L2 scenarios
-        - 'os-odl_l2-nofeature-noha':
+        - 'os-odl-nofeature-ha':
             auto-trigger-name: 'daisy-{scenario}-{pod}-daily-{stream}-trigger'
 
     jobs:
@@ -150,7 +147,7 @@
             installer: '{installer}'
         - string:
             name: DEPLOY_SCENARIO
-            default: 'os-nosdn-nofeature-noha'
+            default: 'os-nosdn-nofeature-ha'
         - 'daisy-project-parameter':
             gs-pathname: '{gs-pathname}'
         - string:
@@ -180,46 +177,36 @@
 #-----------------------------------------------
 # 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 12 * * *'
+# Basic NOHA Scenarios
 - trigger:
     name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-master-trigger'
     triggers:
-        - timed: 'H 12 * * *'
-# ODL_L3 Scenarios
-- trigger:
-    name: 'daisy-os-odl_l3-nofeature-noha-baremetal-daily-master-trigger'
-    triggers:
-        - timed: 'H 16 * * *'
-# ODL_L2 Scenarios
+        - timed: ''
+# ODL Scenarios
 - trigger:
-    name: 'daisy-os-odl_l2-nofeature-noha-baremetal-daily-master-trigger'
+    name: 'daisy-os-odl-nofeature-ha-baremetal-daily-master-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 16 * * *'
 #-----------------------------------------------
 # 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 12 * * *'
-# ODL_L3 Scenarios
-- trigger:
-    name: 'daisy-os-odl_l3-nofeature-noha-virtual-daily-master-trigger'
-    triggers:
-        - timed: 'H 16 * * *'
-# ODL_L3 Scenarios
+        - timed: ''
+# ODL Scenarios
 - trigger:
-    name: 'daisy-os-odl_l2-nofeature-noha-virtual-daily-master-trigger'
+    name: 'daisy-os-odl-nofeature-ha-virtual-daily-master-trigger'
     triggers:
-        - timed: ''
-
+        - timed: '0 12 * * *'