From f8c5d29a6cd4e4090c2cb0cf6a29c93e3bb4628b Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Wed, 10 Dec 2014 23:26:52 +0000 Subject: [PATCH] Revert "Temporarily disable testing lbaas, fwaas, and vpnaas" The advanced services migration has finished let's re-enable the temporarily disabled testing and services. This reverts commit 5358740468554afcf4fbef0aa16b6f76bf68cae9. Change-Id: I10cdc1c6081aa2f66e924d65a8151e3bd118c7a2 --- devstack-vm-gate.sh | 10 ---------- features.yaml | 2 +- test-features.sh | 4 ++-- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index cef89782..905be53f 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -85,16 +85,6 @@ function setup_localrc { if [[ "$DEVSTACK_GATE_NEUTRON" -eq "1" ]]; then echo "Q_USE_DEBUG_COMMAND=True" >>"$localrc_file" echo "NETWORK_GATEWAY=10.1.0.1" >>"$localrc_file" - # NOTE(mtreinish): This is only temporary and needed for the advanced - # services split. It will eventually break tempest on stable branches - # when new extension tests are added. The real way to do this is in - # progress as part of bp branchless-tempest-extensions - NET_API_EXT="agent,allowed-address-pairs,binding," - NET_API_EXT+="dhcp_agent_scheduler,dvr,ext-gw-mode,external-net," - NET_API_EXT+="extra_dhcp_opt,extraroute,l3-ha,l3_agent_scheduler," - NET_API_EXT+="metering,multi-provider,provider,quotas,router," - NET_API_EXT+="security-group,service-type" - echo "NETWORK_API_EXTENSIONS=$NET_API_EXT" >>"$localrc_file" fi if [[ "$DEVSTACK_GATE_NEUTRON_DVR" -eq "1" ]]; then diff --git a/features.yaml b/features.yaml index 7aac1dfe..ff5538f7 100644 --- a/features.yaml +++ b/features.yaml @@ -85,7 +85,7 @@ features: neutron: base: - services: [quantum, q-svc, q-agt, q-dhcp, q-l3, q-meta, q-metering] + services: [quantum, q-svc, q-agt, q-dhcp, q-l3, q-meta, q-lbaas, q-vpn, q-fwaas, q-metering] rm-services: [n-net] swift: diff --git a/test-features.sh b/test-features.sh index 2ea80762..507de2c7 100755 --- a/test-features.sh +++ b/test-features.sh @@ -18,9 +18,9 @@ ERRORS=0 TEMPEST_FULL_MASTER="n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,horizon,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,tempest,heat,h-api,h-api-cfn,h-api-cw,h-eng,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,trove,tr-api,tr-tmgr,tr-cond,n-net,sahara" -TEMPEST_NEUTRON_MASTER="n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,horizon,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,tempest,heat,h-api,h-api-cfn,h-api-cw,h-eng,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,trove,tr-api,tr-tmgr,tr-cond,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-metering,sahara" +TEMPEST_NEUTRON_MASTER="n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,horizon,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,tempest,heat,h-api,h-api-cfn,h-api-cw,h-eng,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,trove,tr-api,tr-tmgr,tr-cond,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-lbaas,q-vpn,q-fwaas,q-metering,sahara" -TEMPEST_HEAT_SLOW_MASTER="n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,horizon,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,tempest,heat,h-api,h-api-cfn,h-api-cw,h-eng,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,trove,tr-api,tr-tmgr,tr-cond,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-metering,sahara" +TEMPEST_HEAT_SLOW_MASTER="n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,horizon,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,tempest,heat,h-api,h-api-cfn,h-api-cw,h-eng,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,trove,tr-api,tr-tmgr,tr-cond,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-lbaas,q-vpn,q-fwaas,q-metering,sahara" GRENADE_NEW_MASTER="n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,horizon,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,tempest,n-net,heat,h-api,h-api-cfn,h-api-cw,h-eng,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification"