From 73b0377ff996bb971cad13b24f7c044c85e2d33e Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Tue, 15 Apr 2014 10:57:48 -0400 Subject: [PATCH] enable heat in grenade this enables heat in the grenade jobs. Because we need to explicitly tell tempest what services to test, this doesn't actually test heat (that will depend on additional grenade changes). This is therefore a largely no-op change in normal runs which will make it possible for the heat team to add real grenade support. Change-Id: I6cfb2e4abf43abf91f96e85e82fcdd1fee3f9470 --- features.yaml | 2 +- test-features.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/features.yaml b/features.yaml index 509132e3..3c05cf83 100644 --- a/features.yaml +++ b/features.yaml @@ -10,7 +10,7 @@ config: features: [postgresql] # feature changes for different test matrixes grenade: - rm-features: [ceilometer, heat, trove, sahara] + rm-features: [ceilometer, trove, sahara] tempest: features: [tempest] # feature changes for different configs of existing services diff --git a/test-features.sh b/test-features.sh index 34b7a8f5..edf22ece 100755 --- a/test-features.sh +++ b/test-features.sh @@ -22,9 +22,9 @@ TEMPEST_NEUTRON_MASTER="n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,hor 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" +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" -GRENADE_OLD_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" +GRENADE_OLD_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" TEMPEST_FULL_HAVANA="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,n-net"