From 626faaee06cc74d6ec17517aaa56c5e51c768350 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Thu, 13 Aug 2015 08:25:32 -0700 Subject: [PATCH] Add q-vpn back to base services but exclude for liberty runs Commit c59dfacef8c211b7e114e634ca17f225bde6c3e0 removed the q-vpn service from being enabled in all neutron runs which is OK for liberty since that project has it's own devstack plugin and job configs for master, but it breaks stable/kilo. So add the q-vpn service back in for kilo. Related-Bug: #1473475 Change-Id: I69ea5b194fec520e1aa31eb0554cf83c447a5e18 --- features.yaml | 2 ++ test-features.sh | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/features.yaml b/features.yaml index b15083d7..6c8518a2 100644 --- a/features.yaml +++ b/features.yaml @@ -90,6 +90,8 @@ features: base: services: [quantum, q-svc, q-agt, q-dhcp, q-l3, q-meta, q-lbaas, q-fwaas, q-metering] rm-services: [n-net] + kilo: + services: [q-vpn] swift: base: diff --git a/test-features.sh b/test-features.sh index 2fce73b2..cb1d3116 100755 --- a/test-features.sh +++ b/test-features.sh @@ -20,6 +20,8 @@ TEMPEST_FULL_MASTER="n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,horizo 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,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-lbaas,q-fwaas,q-metering" +TEMPEST_NEUTRON_KILO="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,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-lbaas,q-fwaas,q-metering,q-vpn" + 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,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-lbaas,q-fwaas,q-metering" 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,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification" @@ -65,6 +67,11 @@ function test_neutron_master { assert_list_equal $TEMPEST_NEUTRON_MASTER $results } +function test_neutron_kilo { + local results=$(DEVSTACK_GATE_NEUTRON=1 DEVSTACK_GATE_TEMPEST=1 ./test-matrix.py -b stable/kilo) + assert_list_equal $TEMPEST_NEUTRON_KILO $results +} + function test_heat_slow_master { local results=$(DEVSTACK_GATE_TEMPEST_HEAT_SLOW=1 DEVSTACK_GATE_NEUTRON=1 DEVSTACK_GATE_TEMPEST=1 ./test-matrix.py) assert_list_equal $TEMPEST_HEAT_SLOW_MASTER $results @@ -88,6 +95,7 @@ function test_grenade_icehouse_master { test_full_master test_full_feature_ec test_neutron_master +test_neutron_kilo test_heat_slow_master test_grenade_new_master test_grenade_juno_master