openstack
/
heat
Code Issues Proposed changes

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
This commit is contained in:
ricolin 2017-11-19 16:15:22 +08:00 committed by Rico Lin
parent 121627bce7
commit ee56adbd79
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.zuul.yaml
View File

@ -56,14 +56,12 @@
- job: - job:
name: heat-functional-convg-mysql-lbaasv2-non-apache name: heat-functional-convg-mysql-lbaasv2-non-apache
parent: heat-functional-devstack-base parent: heat-functional-devstack-base
branches: ^(?!stable/newton).*$
vars: vars:
use_apache: 0 use_apache: 0
- job: - job:
name: heat-functional-convg-mysql-lbaasv2-py35 name: heat-functional-convg-mysql-lbaasv2-py35
parent: heat-functional-devstack-base parent: heat-functional-devstack-base
branches: ^(?!stable/(newton|ocata)).*$
vars: vars:
use_python3: 1 use_python3: 1
@ -81,7 +79,6 @@
run: playbooks/devstack/grenade/run run: playbooks/devstack/grenade/run
post-run: playbooks/devstack/functional/post post-run: playbooks/devstack/functional/post
timeout: 7800 timeout: 7800
branches: ^(?!(driverfixes|stable/(mitaka|newton))).*$
required-projects: required-projects:
- openstack-dev/grenade - openstack-dev/grenade
- openstack-infra/devstack-gate - openstack-infra/devstack-gate

14
playbooks/devstack/functional/run.yaml
View File

@ -29,16 +29,10 @@
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
services=rabbit,tempest,mysql,dstat,key services=rabbit,tempest,mysql,dstat,key
services+=,n-api,n-api-meta,n-cpu,n-cond,n-sch,n-crt services+=,n-api,n-api-meta,n-cpu,n-cond,n-sch,n-crt
services+=,placement-api,placement-client
# 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+=,g-api,g-reg services+=,g-api,g-reg
services+=,c-sch,c-api,c-vol,c-bak 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 if [ "{{ use_python3 }}" -eq 1 ] ; then
export DEVSTACK_GATE_USE_PYTHON3=True export DEVSTACK_GATE_USE_PYTHON3=True
@ -47,10 +41,6 @@
export DEVSTACK_GATE_USE_PYTHON3=False export DEVSTACK_GATE_USE_PYTHON3=False
services+=,s-proxy,s-object,s-container,s-account services+=,s-proxy,s-object,s-container,s-account
fi 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_NEUTRON=1
export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST=1