update sources to v12.1.1

[ceph.git] / ceph / qa / suites / rgw / verify / validater / valgrind.yaml

diff --git a/ceph/qa/suites/rgw/verify/validater/valgrind.yaml b/ceph/qa/suites/rgw/verify/validater/valgrind.yaml
index ef5ef7bd7b5d287a5a1d9d1c1cd4712e154e6429..b2095b0c91db82e4c13f4ed8d4894cb478670899 100644 (file)
--- a/ceph/qa/suites/rgw/verify/validater/valgrind.yaml
+++ b/ceph/qa/suites/rgw/verify/validater/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:
@@ -8,6 +10,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]