diff options
| author |   Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2017-08-09 11:59:45 +0800 |
|---|---|---|
| committer | Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2017-08-09 11:59:53 +0800 |
| commit | 26913a56516d1b0d72ea1d4d72f7362bb0498132 (patch) | |
| tree | 6f7517f9e33d21de5397ab92780b35a5edea9c50 /jjb | |
| parent | bbdfb0cfaa37c6f7648a33b6dd1946c973cde431 (diff) | |
Rename odl_l3 to odl
Rename all scenarios with "odl_l3" in their name in Euphrates to
just "odl".
Change-Id: If2bff0da79f79b9305771d2fc575db1606cd4bf9
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/daisy4nfv/daisy-daily-jobs.yml | 31 |
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: '' - |