From a9b0d5ddb12493ff725048c84406a2f086b111dd Mon Sep 17 00:00:00 2001 From: "Dr. Jens Harbott" Date: Wed, 22 Jan 2020 13:31:41 +0000 Subject: [PATCH] Drop peakmem_tracker service When devstack reverted the pip cap in [0], it was necessary to disable the peakmem_tracker service as there was no easy way to make it work in that setup. So we need to delete it from the test-matrix here, too. We could decide to add it only for older stable/branches, but as ds-gate is to be obsoleted anyway, I'm not convinced that that is worth the effort. [0] https://review.opendev.org/561597 Change-Id: I9dd57d3bdb56c64377efbdd55429bd075223c746 --- roles/test-matrix/files/features.yaml | 4 ++-- test-features.sh | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/test-matrix/files/features.yaml b/roles/test-matrix/files/features.yaml index 1a247b38..8de4c903 100644 --- a/roles/test-matrix/files/features.yaml +++ b/roles/test-matrix/files/features.yaml @@ -77,7 +77,7 @@ branches: primary: default: base: - services: [mysql, rabbit, dstat, peakmem_tracker, etcd3] + services: [mysql, rabbit, dstat, etcd3] ceilometer: base: @@ -228,7 +228,7 @@ primary: subnode: default: base: - services: [dstat, peakmem_tracker] + services: [dstat] ceilometer: base: diff --git a/test-features.sh b/test-features.sh index 86319741..3f447f32 100755 --- a/test-features.sh +++ b/test-features.sh @@ -16,15 +16,15 @@ 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,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,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,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,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" +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,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,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,peakmem_tracker,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,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,tempest,placement-api" -GRENADE_SUBNODE_MASTER="n-api-meta,n-cpu,g-api,c-vol,dstat,peakmem_tracker,placement-client" +GRENADE_SUBNODE_MASTER="n-api-meta,n-cpu,g-api,c-vol,dstat,placement-client" # Utility function for tests function assert_list_equal {