From f0008986a14caf549cb777a1363424308d143654 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Fri, 20 Dec 2019 14:53:37 -0500 Subject: [PATCH] Remove 'cinder' service from feature test matrix The cinder config is including the "cinder" devstack service which would mean that anything removed explicitly, like c-bak, is going to be trumped by the fact that 'cinder' is in the enabled services list in a job. This removes 'cinder' the service from cinder the config so that cinder services have to be explicitly enabled/disabled in the feature test matrix. Change-Id: I857fbeba2af4a0f038fd2c2a19bb29c2767227a2 --- roles/test-matrix/files/features.yaml | 2 +- test-features.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/test-matrix/files/features.yaml b/roles/test-matrix/files/features.yaml index 319688a7..01c33422 100644 --- a/roles/test-matrix/files/features.yaml +++ b/roles/test-matrix/files/features.yaml @@ -130,7 +130,7 @@ primary: cinder: base: - services: [cinder, c-api, c-vol, c-sch, c-bak] + services: [c-api, c-vol, c-sch, c-bak] # This will be used to disable c-vol, c-bak on primary node when running multinode grenade # job that will test compatibility of new c-api, c-sch (primary) and old c-vol and c-bak (sub). diff --git a/test-features.sh b/test-features.sh index e6e5a6a3..b88ee81c 100755 --- a/test-features.sh +++ b/test-features.sh @@ -16,13 +16,13 @@ ERRORS=0 -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_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,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-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_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,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-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-cpu,n-sch,n-cond,n-novnc,g-api,g-reg,key,c-api,c-vol,c-sch,c-bak,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-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" +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,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,peakmem_tracker,etcd3,tempest,placement-api" # Utility function for tests function assert_list_equal {