Modernize default services in the test matrix

Ceilometer is not installed by default in legacy jobs using
devstack-gate so we shouldn't be enabling it by default. Anything
that cares about testing with ceilometer should be using a zuulv3
based job with the ceilometer devstack plugin and explicitly
enabling the service. So ceilometer is removed from the default
list of enabled services.

This also removes some now-dead nova services (n-obj, ha).

Change-Id: If8237c94be2b1db210f83bc9871792af9c5c868f
This commit is contained in:
Matt Riedemann 2019-12-20 12:58:47 -05:00
parent 0443da119f
commit 2767c8690d
2 changed files with 7 additions and 7 deletions

View File

@ -1,6 +1,6 @@
config: config:
default: default:
master: [default, ceilometer, glance, nova, placement, swift, cinder, keystone] master: [default, glance, nova, placement, swift, cinder, keystone]
train: [default, ceilometer, glance, nova, placement, swift, cinder, keystone] train: [default, ceilometer, glance, nova, placement, swift, cinder, keystone]
stein: [default, ceilometer, glance, nova, placement, swift, cinder, keystone] stein: [default, ceilometer, glance, nova, placement, swift, cinder, keystone]
rocky: [default, ceilometer, glance, nova, placement, swift, cinder, keystone] rocky: [default, ceilometer, glance, nova, placement, swift, cinder, keystone]
@ -94,7 +94,7 @@ primary:
nova: nova:
base: base:
services: [n-api, n-cauth, n-cond, n-cpu, n-net, n-novnc, n-obj, n-sch, n-api-meta] services: [n-api, n-cond, n-cpu, n-novnc, n-sch, n-api-meta]
nova-cells: nova-cells:
base: base:
@ -276,7 +276,7 @@ subnode:
nova: nova:
base: base:
services: [n-cpu, n-net, n-api-meta] services: [n-cpu, n-api-meta]
placement: placement:
base: base:

View File

@ -16,13 +16,13 @@
ERRORS=0 ERRORS=0
TEMPEST_FULL_MASTER="n-api,n-api-meta,n-obj,n-cpu,n-sch,n-cond,n-novnc,n-cauth,g-api,g-reg,key,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,peakmem_tracker,etcd3,tempest,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,n-net,placement-api" TEMPEST_FULL_MASTER="n-api,n-api-meta,n-cpu,n-sch,n-cond,n-novnc,g-api,g-reg,key,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,peakmem_tracker,etcd3,tempest,placement-api"
TEMPEST_NEUTRON_MASTER="n-api,n-api-meta,n-obj,n-cpu,n-sch,n-cond,n-novnc,n-cauth,g-api,g-reg,key,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,peakmem_tracker,etcd3,tempest,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-metering,placement-api" TEMPEST_NEUTRON_MASTER="n-api,n-api-meta,n-cpu,n-sch,n-cond,n-novnc,g-api,g-reg,key,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,peakmem_tracker,etcd3,tempest,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-metering,placement-api"
TEMPEST_HEAT_SLOW_MASTER="n-api,n-api-meta,n-obj,n-cpu,n-sch,n-cond,n-novnc,n-cauth,g-api,g-reg,key,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,peakmem_tracker,etcd3,tempest,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-metering,placement-api" TEMPEST_HEAT_SLOW_MASTER="n-api,n-api-meta,n-cpu,n-sch,n-cond,n-novnc,g-api,g-reg,key,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,peakmem_tracker,etcd3,tempest,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-metering,placement-api"
GRENADE_NEW_MASTER="n-api,n-api-meta,n-obj,n-cpu,n-sch,n-cond,n-novnc,n-cauth,g-api,g-reg,key,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,peakmem_tracker,etcd3,tempest,n-net,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,placement-api" GRENADE_NEW_MASTER="n-api,n-api-meta,n-cpu,n-sch,n-cond,n-novnc,g-api,g-reg,key,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,peakmem_tracker,etcd3,tempest,placement-api"
# Utility function for tests # Utility function for tests
function assert_list_equal { function assert_list_equal {