From 8f27c845bec7b4c68e5252734dc96e1dc3391976 Mon Sep 17 00:00:00 2001
From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 12 Apr 2021 12:04:22 -0400
Subject: [PATCH] qa/rgw: move rgw/multisite valgrind config into
 valgrind.yaml.disabled

the valgrind coverage wasn't enabled, and it will take a lot more work
before we can reenable

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---
 qa/suites/rgw/multisite/tasks/test_multi.yaml |  9 ---------
 qa/suites/rgw/multisite/valgrind.yaml         | 20 -------------------
 .../rgw/multisite/valgrind.yaml.disabled      | 20 +++++++++++++++++++
 3 files changed, 20 insertions(+), 29 deletions(-)
 delete mode 100644 qa/suites/rgw/multisite/valgrind.yaml
 create mode 100644 qa/suites/rgw/multisite/valgrind.yaml.disabled

diff --git a/qa/suites/rgw/multisite/tasks/test_multi.yaml b/qa/suites/rgw/multisite/tasks/test_multi.yaml
index 3247f241619..1a65a67b5aa 100644
--- a/qa/suites/rgw/multisite/tasks/test_multi.yaml
+++ b/qa/suites/rgw/multisite/tasks/test_multi.yaml
@@ -1,8 +1,3 @@
-# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
-#os_type: centos
-# ubuntu and no valgrind until we migrate test to py3
-os_type: ubuntu
-
 tasks:
 - install:
 - ceph: {cluster: c1}
@@ -10,16 +5,12 @@ tasks:
 - rgw:
     c1.client.0:
       port: 8000
-#      valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214
     c1.client.1:
       port: 8001
-#      valgrind: [--tool=memcheck, --max-threads=1024]
     c2.client.0:
       port: 8000
-#      valgrind: [--tool=memcheck, --max-threads=1024]
     c2.client.1:
       port: 8001
-#      valgrind: [--tool=memcheck, --max-threads=1024]
 - rgw-multisite:
 - rgw-multisite-tests:
     config:
diff --git a/qa/suites/rgw/multisite/valgrind.yaml b/qa/suites/rgw/multisite/valgrind.yaml
deleted file mode 100644
index 71c56fae467..00000000000
--- a/qa/suites/rgw/multisite/valgrind.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
-#os_type: centos
-# ubuntu and no valgrind until we migrate test to py3
-os_type: ubuntu
-
-overrides:
-  install:
-    ceph:
-  ceph:
-    conf:
-      global:
-        osd heartbeat grace: 40
-      mon:
-        mon osd crush smoke test: false
-      osd:
-        osd fast shutdown: false
-#    valgrind:
-#      mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes]
-#      osd: [--tool=memcheck]
-#      mds: [--tool=memcheck]
diff --git a/qa/suites/rgw/multisite/valgrind.yaml.disabled b/qa/suites/rgw/multisite/valgrind.yaml.disabled
new file mode 100644
index 00000000000..36e20f02c3e
--- /dev/null
+++ b/qa/suites/rgw/multisite/valgrind.yaml.disabled
@@ -0,0 +1,20 @@
+overrides:
+  install:
+    ceph:
+  ceph:
+    conf:
+      global:
+        osd heartbeat grace: 40
+      mon:
+        mon osd crush smoke test: false
+      osd:
+        osd fast shutdown: false
+  rgw:
+    c1.client.0:
+      valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214
+    c1.client.1:
+      valgrind: [--tool=memcheck, --max-threads=1024]
+    c2.client.0:
+      valgrind: [--tool=memcheck, --max-threads=1024]
+    c2.client.1:
+      valgrind: [--tool=memcheck, --max-threads=1024]