openstack/project-config
Code Issues Proposed changes

Only run heat api tests in grenade heat job

Browse Source 
Only run heat api tests after grenade upgrade. This also removes some
services not required for the tests inlcuding vpnaas.

Change-Id: I528fa56d83d3eff6b262f0f110c9fdc1b297238d
This commit is contained in:
Rabi Mishra 2016-05-05 07:54:04 +05:30
parent c9ab4b0854
commit 3a0a8f1fc9
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jenkins/jobs/heat.yaml
View File

@ -238,26 +238,17 @@
export PROJECTS="openstack-dev/grenade $PROJECTS" export PROJECTS="openstack-dev/grenade $PROJECTS"
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
OVERRIDE_ENABLED_SERVICES=c-api,c-bak,c-sch,c-vol,cinder,dstat,g-api,g-reg,h-api,h-api-cfn,h-api-cw,h-eng,heat,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,rabbit,s-account,s-container,s-object,s-proxy,q-lbaas,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api OVERRIDE_ENABLED_SERVICES=c-api,c-bak,c-sch,c-vol,cinder,dstat,g-api,g-reg,h-api,h-api-cfn,h-api-cw,h-eng,heat,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,rabbit,s-account,s-container,s-object,s-proxy
export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
export GRENADE_PLUGINRC="enable_grenade_plugin heat https://git.openstack.org/openstack/heat" export GRENADE_PLUGINRC="enable_grenade_plugin heat https://git.openstack.org/openstack/heat"
# n-obj has been removed from mitaka # n-obj has been removed from mitaka
if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then
OVERRIDE_ENABLED_SERVICES+=,n-obj OVERRIDE_ENABLED_SERVICES+=,n-obj
fi fi
# in liberty, vpnaas switched to devstack plugin
if [[ $ZUUL_BRANCH == "stable/kilo" ]]; then
OVERRIDE_ENABLED_SERVICES+=,q-vpn
else
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-vpnaas https://git.openstack.org/openstack/neutron-vpnaas"
export GRENADE_PLUGINRC+=$'\n'"enable_grenade_plugin neutron-vpnaas https://git.openstack.org/openstack/neutron-vpnaas"
fi
export OVERRIDE_ENABLED_SERVICES export OVERRIDE_ENABLED_SERVICES
export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TEMPEST=0 export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_REGEX='tempest.api.orchestration.*'
export DEVSTACK_GATE_GRENADE=pullup export DEVSTACK_GATE_GRENADE=pullup
export BRANCH_OVERRIDE={branch-override} export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then if [ "$BRANCH_OVERRIDE" != "default" ] ; then