diff options
| author | ricolin <rico.lin@easystack.cn> | 2017-11-19 16:15:22 +0800 |
|---|---|---|
| committer | Rico Lin <rico.lin@easystack.cn> | 2017-12-01 10:31:12 +0000 |
| commit | ee56adbd791e0ede9c3d92ab0a776d1776de6d47 (patch) | |
| tree | 8b602ea83e533ae04c12defd9aecd78852005225 /playbooks/devstack/functional/run.yaml | |
| parent | 121627bce76bae2b193b0b86baa1ed14e96ddd8e (diff) | |
| download | heat-ee56adbd791e0ede9c3d92ab0a776d1776de6d47.tar.gz | |
Update Zuul branch limit
Now mitaka and newton already mark as EOL, so we should remove any
branch limit that relative to those branches.
Also since we have dependent zuul jobs for each branch, we remove
ocata branch limit from master.
Change-Id: Ide2ddbe4d50faa0356992b55d99c1b1af8a44a35
Diffstat (limited to 'playbooks/devstack/functional/run.yaml')
| -rw-r--r-- | playbooks/devstack/functional/run.yaml | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/playbooks/devstack/functional/run.yaml b/playbooks/devstack/functional/run.yaml index 8263f90d0..1df87d386 100644 --- a/playbooks/devstack/functional/run.yaml +++ b/playbooks/devstack/functional/run.yaml @@ -29,16 +29,10 @@ export PYTHONUNBUFFERED=true services=rabbit,tempest,mysql,dstat,key services+=,n-api,n-api-meta,n-cpu,n-cond,n-sch,n-crt - - # TODO(ricolin) replace the usage of ZUUL_BRANCH - # placement services mandatory for nova from ocata - if [[ "stable/newton" != $ZUUL_BRANCH ]]; then - services+=,placement-api,placement-client - fi - + services+=,placement-api,placement-client services+=,g-api,g-reg services+=,c-sch,c-api,c-vol,c-bak - services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3 + services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3,q-trunk if [ "{{ use_python3 }}" -eq 1 ] ; then export DEVSTACK_GATE_USE_PYTHON3=True @@ -47,10 +41,6 @@ export DEVSTACK_GATE_USE_PYTHON3=False services+=,s-proxy,s-object,s-container,s-account fi - # TODO(ricolin) replace the usage of ZUUL_BRANCH - if [[ ! "stable/newton stable/ocata" =~ $ZUUL_BRANCH ]]; then - services+=,q-trunk - fi export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_TEMPEST=1 |