diff options
| author | Zuul <zuul@review.openstack.org> | 2017-12-11 14:13:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-12-11 14:13:42 +0000 |
| commit | d03514e3c8b26a3c73ab90c36176901413875f42 (patch) | |
| tree | 42db0241e32ab4a4727c81b9d50ca25f5eacccf6 | |
| parent | e614e683a64ebfd8ffa86643cdb70c3995c17d09 (diff) | |
| parent | ee56adbd791e0ede9c3d92ab0a776d1776de6d47 (diff) | |
| download | heat-d03514e3c8b26a3c73ab90c36176901413875f42.tar.gz | |
Merge "Update Zuul branch limit"
| -rw-r--r-- | .zuul.yaml | 3 | ||||
| -rw-r--r-- | playbooks/devstack/functional/run.yaml | 14 |
2 files changed, 2 insertions, 15 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index d5bf9dc49..072ca5f53 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -57,14 +57,12 @@ - job: name: heat-functional-convg-mysql-lbaasv2-non-apache parent: heat-functional-devstack-base - branches: ^(?!stable/newton).*$ vars: use_apache: 0 - job: name: heat-functional-convg-mysql-lbaasv2-py35 parent: heat-functional-devstack-base - branches: ^(?!stable/(newton|ocata)).*$ vars: use_python3: 1 @@ -82,7 +80,6 @@ run: playbooks/devstack/grenade/run.yaml post-run: playbooks/devstack/functional/post.yaml timeout: 7800 - branches: ^(?!(driverfixes|stable/(mitaka|newton))).*$ required-projects: - openstack-dev/grenade - openstack-infra/devstack-gate diff --git a/playbooks/devstack/functional/run.yaml b/playbooks/devstack/functional/run.yaml index 836e8c3ef..05a5cbb6f 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 |