From: Sage Weil <sage@newdream.net>
Date: Fri, 19 Feb 2021 19:20:08 +0000 (-0600)
Subject: qa/suites: do not use notcmalloc flavor
X-Git-Tag: v15.2.10~44^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1775f4451e051ae2471ef6b7ac9a2a48992b9557;p=ceph.git

qa/suites: do not use notcmalloc flavor

teuthology now knows how to run valgrind against a tcmalloc binary

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit dc64ccf063f1ddf843fae4d2621ec25187f56135)

# Conflicts:
#	qa/suites/rgw/sts/tasks/0-install.yaml
  - test not present in octopus
#	qa/suites/rgw/verify/validater/valgrind.yaml
---

diff --git a/qa/suites/fs/verify/validater/valgrind.yaml b/qa/suites/fs/verify/validater/valgrind.yaml
index bf10aee699a06..3da39d69b3c3a 100644
--- a/qa/suites/fs/verify/validater/valgrind.yaml
+++ b/qa/suites/fs/verify/validater/valgrind.yaml
@@ -4,7 +4,6 @@
 overrides:
   install:
     ceph:
-      flavor: notcmalloc
       debuginfo: true
   ceph:
     # Valgrind makes everything slow, so ignore slow requests and extend heartbeat grace
diff --git a/qa/suites/rados/valgrind-leaks/1-start.yaml b/qa/suites/rados/valgrind-leaks/1-start.yaml
index 4f4fc33cc7c4b..112956c7d2ba5 100644
--- a/qa/suites/rados/valgrind-leaks/1-start.yaml
+++ b/qa/suites/rados/valgrind-leaks/1-start.yaml
@@ -6,7 +6,6 @@ openstack:
 overrides:
   install:
     ceph:
-      flavor: notcmalloc
       debuginfo: true
   ceph:
     log-whitelist:
diff --git a/qa/suites/rados/verify/validater/valgrind.yaml b/qa/suites/rados/verify/validater/valgrind.yaml
index 83eb2add54300..4f82387a3030c 100644
--- a/qa/suites/rados/verify/validater/valgrind.yaml
+++ b/qa/suites/rados/verify/validater/valgrind.yaml
@@ -4,7 +4,6 @@ os_type: centos
 overrides:
   install:
     ceph:
-      flavor: notcmalloc
       debuginfo: true
   ceph:
     conf:
diff --git a/qa/suites/rbd/valgrind/validator/memcheck.yaml b/qa/suites/rbd/valgrind/validator/memcheck.yaml
index c660dce623d04..fcea1b88cf6e3 100644
--- a/qa/suites/rbd/valgrind/validator/memcheck.yaml
+++ b/qa/suites/rbd/valgrind/validator/memcheck.yaml
@@ -4,7 +4,6 @@ os_type: centos
 overrides:
   install:
     ceph:
-      flavor: notcmalloc
       debuginfo: true
   rbd_fsx:
     valgrind: ["--tool=memcheck"]
diff --git a/qa/suites/rgw/multisite/valgrind.yaml b/qa/suites/rgw/multisite/valgrind.yaml
index d6686ef2a2122..71c56fae4670e 100644
--- a/qa/suites/rgw/multisite/valgrind.yaml
+++ b/qa/suites/rgw/multisite/valgrind.yaml
@@ -6,7 +6,6 @@ os_type: ubuntu
 overrides:
   install:
     ceph:
-#      flavor: notcmalloc
   ceph:
     conf:
       global:
diff --git a/qa/suites/rgw/verify/validater/valgrind.yaml b/qa/suites/rgw/verify/validater/valgrind.yaml
index 42af3adf5a31a..b3f412748cd13 100644
--- a/qa/suites/rgw/verify/validater/valgrind.yaml
+++ b/qa/suites/rgw/verify/validater/valgrind.yaml
@@ -5,7 +5,6 @@ os_version: "8.0"
 overrides:
   install:
     ceph:
-#      flavor: notcmalloc
       #debuginfo: true
   ceph:
     conf:
diff --git a/qa/suites/rgw/website/overrides.yaml b/qa/suites/rgw/website/overrides.yaml
index 0eb474980f57e..e1ac1a983584e 100644
--- a/qa/suites/rgw/website/overrides.yaml
+++ b/qa/suites/rgw/website/overrides.yaml
@@ -4,7 +4,6 @@
 
 overrides:
   install:
-#    flavor: notcmalloc
   ceph:
     conf:
       global: