update sources to v12.1.1

[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 1e17c783a0795ef1e85c68136637198347fddfc8..08fad9da02381e15955f85b1a236f55d70455a75 100644 (file)
--- a/ceph/qa/suites/rgw/multisite/valgrind.yaml
+++ b/ceph/qa/suites/rgw/multisite/valgrind.yaml
@@ -1,4 +1,6 @@
-os_type: centos   # xenial valgrind buggy, see http://tracker.ceph.com/issues/18126
+# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
+os_type: centos
+
 overrides:
   install:
     ceph:
@@ -7,6 +9,8 @@ overrides:
     conf:
       global:
         osd heartbeat grace: 40
+      mon:
+        mon osd crush smoke test: false
     valgrind:
       mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes]
       osd: [--tool=memcheck]