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>

diff --git a/qa/suites/rgw/multisite/tasks/test_multi.yaml b/qa/suites/rgw/multisite/tasks/test_multi.yaml
index 3247f241619bb30b6631ad6f61c29f5b8c7d63ac..1a65a67b5aa523d31ee50a325893399f4a0352cb 100644 (file)
--- 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 (file)
index 71c56fa..0000000
--- 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 (file)
index 0000000..36e20f0
--- /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]