From 3a0a8f1fc9acb8eeb4d655db0f04ab12c85737c7 Mon Sep 17 00:00:00 2001 From: Rabi Mishra Date: Thu, 5 May 2016 07:54:04 +0530 Subject: [PATCH] Only run heat api tests in grenade heat job Only run heat api tests after grenade upgrade. This also removes some services not required for the tests inlcuding vpnaas. Change-Id: I528fa56d83d3eff6b262f0f110c9fdc1b297238d --- jenkins/jobs/heat.yaml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/jenkins/jobs/heat.yaml b/jenkins/jobs/heat.yaml index f602d7f288..32e7ff657c 100644 --- a/jenkins/jobs/heat.yaml +++ b/jenkins/jobs/heat.yaml @@ -238,26 +238,17 @@ export PROJECTS="openstack-dev/grenade $PROJECTS" 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 - - export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" - + 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 GRENADE_PLUGINRC="enable_grenade_plugin heat https://git.openstack.org/openstack/heat" # n-obj has been removed from mitaka if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then OVERRIDE_ENABLED_SERVICES+=,n-obj 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 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 BRANCH_OVERRIDE={branch-override} if [ "$BRANCH_OVERRIDE" != "default" ] ; then