summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorJun Li <lijun_1203@126.com>2017-09-14 06:38:29 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-14 06:38:29 +0000
commit321d339d1aa81f65598755c33306e6eb23e1be95 (patch)
treecb8de4421d4941b337acc5904748e6c5f39aa272 /jjb
parent6ab401aaa8ce41526ae6c345ab0fa13f7713fff5 (diff)
parentfbd3ee6a2f28ef327ddb54ff7127218ebdb79aaa (diff)
Merge "Add danube scenario "os-odl_l2-bgpvpn-ha" in fuel pod zte-pod1"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/fuel/fuel-daily-jobs.yml15
1 files changed, 14 insertions, 1 deletions
diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml
index deadefb6b..c8c3746b0 100644
--- a/jjb/fuel/fuel-daily-jobs.yml
+++ b/jjb/fuel/fuel-daily-jobs.yml
@@ -101,6 +101,15 @@
auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
- 'os-nosdn-kvm_ovs_dpdk_bar-noha':
auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+ # danube scenario for Dovetail only
+ - 'os-odl_l2-bgpvpn-ha':
+ auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+
+ exclude:
+ - scenario: os-odl_l2-bgpvpn-ha
+ stream: master
+ - scenario: os-odl_l2-bgpvpn-ha
+ stream: euphrates
jobs:
- 'fuel-{scenario}-{pod}-daily-{stream}'
@@ -191,7 +200,7 @@
# 6.ZTE pod1, os-nosdn-nofeature-ha and os-odl-bgpvpn-ha, run against danube
- conditional-step:
condition-kind: regex-match
- regex: os-(nosdn-nofeature|odl-bgpvpn)-ha
+ regex: os-(nosdn-nofeature|odl_l2-bgpvpn)-ha
label: '{scenario}'
steps:
- trigger-builds:
@@ -827,6 +836,10 @@
triggers:
- timed: '0 2 * * 6'
- trigger:
+ name: 'fuel-os-odl_l2-bgpvpn-ha-zte-pod1-daily-danube-trigger'
+ triggers:
+ - timed: '0 2 * * 1,3,5'
+- trigger:
name: 'fuel-os-odl-nofeature-ha-zte-pod1-daily-danube-trigger'
triggers:
- timed: ''