update sources to v12.1.1

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

diff --git a/ceph/qa/suites/fs/verify/validater/valgrind.yaml b/ceph/qa/suites/fs/verify/validater/valgrind.yaml
index 82a6574752f9e5b50e00d1482d7e2f8892dcb257..6982cedfcaba956b049071e1586fd02d65564bf2 100644 (file)
--- a/ceph/qa/suites/fs/verify/validater/valgrind.yaml
+++ b/ceph/qa/suites/fs/verify/validater/valgrind.yaml
@@ -1,3 +1,5 @@
+# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
+os_type: centos
 
 # Valgrind makes everything slow, so ignore slow requests
 overrides:
@@ -5,7 +7,6 @@ overrides:
     log-whitelist:
       - slow requests are blocked
 
-os_type: centos   # xenial valgrind buggy, see http://tracker.ceph.com/issues/18126
 overrides:
   install:
     ceph:
@@ -15,6 +16,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]