import 15.2.0 Octopus source

[ceph.git] / ceph / qa / suites / rgw / multisite / valgrind.yaml

diff --git a/ceph/qa/suites/rgw/multisite/valgrind.yaml b/ceph/qa/suites/rgw/multisite/valgrind.yaml
index 99489951b4a9bca80796f424522716fa346f3053..d6686ef2a21225afeee6fc3224c2dcb1d29f06b0 100644 (file)
--- a/ceph/qa/suites/rgw/multisite/valgrind.yaml
+++ b/ceph/qa/suites/rgw/multisite/valgrind.yaml
@@ -1,10 +1,12 @@
 # see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
-os_type: centos
+#os_type: centos
+# ubuntu and no valgrind until we migrate test to py3
+os_type: ubuntu
 
 overrides:
   install:
     ceph:
-      flavor: notcmalloc
+#      flavor: notcmalloc
   ceph:
     conf:
       global:
@@ -13,7 +15,7 @@ overrides:
         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]
+#    valgrind:
+#      mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes]
+#      osd: [--tool=memcheck]
+#      mds: [--tool=memcheck]