summaryrefslogtreecommitdiffstats
path: root/jjb/daisy4nfv
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/daisy4nfv')
-rw-r--r--jjb/daisy4nfv/daisy-daily-jobs.yml31
1 files changed, 9 insertions, 22 deletions
diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index 6524d2051..d7c1acbe0 100644
--- 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-ha':
- auto-trigger-name: 'daisy-{scenario}-{pod}-daily-{stream}-trigger'
- # ODL_L2 scenarios
- - 'os-odl_l2-nofeature-ha':
+ - 'os-odl-nofeature-ha':
auto-trigger-name: 'daisy-{scenario}-{pod}-daily-{stream}-trigger'
jobs:
@@ -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: '0 12 * * *'
-# NOHA Scenarios
+# Basic NOHA Scenarios
- trigger:
name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-master-trigger'
triggers:
- timed: ''
-# ODL_L3 Scenarios
+# ODL Scenarios
- trigger:
- name: 'daisy-os-odl_l3-nofeature-ha-baremetal-daily-master-trigger'
+ name: 'daisy-os-odl-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
#-----------------------------------------------
+# Basic HA Scenarios
- trigger:
name: 'daisy-os-nosdn-nofeature-ha-virtual-daily-master-trigger'
triggers:
- timed: '0 12 * * *'
-# NOHA Scenarios
+# Basic NOHA Scenarios
- trigger:
name: 'daisy-os-nosdn-nofeature-noha-virtual-daily-master-trigger'
triggers:
- timed: ''
-# ODL_L3 Scenarios
+# ODL Scenarios
- trigger:
- name: 'daisy-os-odl_l3-nofeature-ha-virtual-daily-master-trigger'
+ name: 'daisy-os-odl-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: ''
-