From: Sage Weil <sage@newdream.net>
Date: Thu, 18 Feb 2021 22:00:59 +0000 (-0600)
Subject: qa/suites: do not use notcmalloc flavor
X-Git-Tag: v16.2.0~191^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3272b569ee4c14a0c5902b0dd62219039ea0ea7a;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/verify/validater/valgrind.yaml
 - conflict on commented out line
---

diff --git a/qa/suites/fs/verify/validater/valgrind.yaml b/qa/suites/fs/verify/validater/valgrind.yaml
index 4a2d4608407..077efdd6f14 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 90381a43ceb..9263f2a838b 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-ignorelist:
diff --git a/qa/suites/rados/verify/validater/valgrind.yaml b/qa/suites/rados/verify/validater/valgrind.yaml
index 40987dafa4e..03accceaff2 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 c660dce623d..fcea1b88cf6 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 d6686ef2a21..71c56fae467 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/sts/tasks/0-install.yaml b/qa/suites/rgw/sts/tasks/0-install.yaml
index 5ebe67269f3..ae75c1884d9 100644
--- a/qa/suites/rgw/sts/tasks/0-install.yaml
+++ b/qa/suites/rgw/sts/tasks/0-install.yaml
@@ -3,7 +3,6 @@ os_type: centos
 
 tasks:
 - install:
-#    flavor: notcmalloc
 - ceph:
 - openssl_keys:
 - rgw:
diff --git a/qa/suites/rgw/verify/validater/valgrind.yaml b/qa/suites/rgw/verify/validater/valgrind.yaml
index 42af3adf5a3..b3f412748cd 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 0eb474980f5..e1ac1a98358 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: