From c7893283cd5a8a3a1683865e7fbbf1df339eaa17 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 30 Jun 2017 09:33:10 -0400 Subject: [PATCH] do all valgrind runs on centos We are fighting two issues with valgrind on ubuntu (xenial, yakkety, and z): http://tracker.ceph.com/issues/18126 http://tracker.ceph.com/issues/20360 Revert this when it is fixed. Signed-off-by: Sage Weil --- qa/suites/fs/verify/validater/valgrind.yaml | 2 ++ qa/suites/rados/singleton-nomsgr/all/valgrind-leaks.yaml | 3 +++ qa/suites/rados/verify/validater/valgrind.yaml | 3 +++ qa/suites/rbd/valgrind/validator/memcheck.yaml | 3 +++ qa/suites/rgw/multisite/tasks/test_multi.yaml | 3 +++ qa/suites/rgw/multisite/valgrind.yaml | 3 +++ qa/suites/rgw/verify/tasks/rgw_s3tests.yaml | 3 +++ qa/suites/rgw/verify/tasks/rgw_swift.yaml | 3 +++ qa/suites/rgw/verify/validater/valgrind.yaml | 3 +++ 9 files changed, 26 insertions(+) diff --git a/qa/suites/fs/verify/validater/valgrind.yaml b/qa/suites/fs/verify/validater/valgrind.yaml index b3e2339821b3f..ae2eced9aa0b3 100644 --- a/qa/suites/fs/verify/validater/valgrind.yaml +++ b/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: diff --git a/qa/suites/rados/singleton-nomsgr/all/valgrind-leaks.yaml b/qa/suites/rados/singleton-nomsgr/all/valgrind-leaks.yaml index fde0dbbe05b97..e5d5702a32b65 100644 --- a/qa/suites/rados/singleton-nomsgr/all/valgrind-leaks.yaml +++ b/qa/suites/rados/singleton-nomsgr/all/valgrind-leaks.yaml @@ -1,3 +1,6 @@ +# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126 +os_type: centos + overrides: install: ceph: diff --git a/qa/suites/rados/verify/validater/valgrind.yaml b/qa/suites/rados/verify/validater/valgrind.yaml index dc63731b1d2c4..73f1e2e831dd1 100644 --- a/qa/suites/rados/verify/validater/valgrind.yaml +++ b/qa/suites/rados/verify/validater/valgrind.yaml @@ -1,3 +1,6 @@ +# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126 +os_type: centos + overrides: install: ceph: diff --git a/qa/suites/rbd/valgrind/validator/memcheck.yaml b/qa/suites/rbd/valgrind/validator/memcheck.yaml index b8d328e8c0823..c660dce623d04 100644 --- a/qa/suites/rbd/valgrind/validator/memcheck.yaml +++ b/qa/suites/rbd/valgrind/validator/memcheck.yaml @@ -1,3 +1,6 @@ +# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126 +os_type: centos + overrides: install: ceph: diff --git a/qa/suites/rgw/multisite/tasks/test_multi.yaml b/qa/suites/rgw/multisite/tasks/test_multi.yaml index 508c06a527011..a8f897873def8 100644 --- a/qa/suites/rgw/multisite/tasks/test_multi.yaml +++ b/qa/suites/rgw/multisite/tasks/test_multi.yaml @@ -1,3 +1,6 @@ +# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126 +os_type: centos + tasks: - install: - ceph: {cluster: c1} diff --git a/qa/suites/rgw/multisite/valgrind.yaml b/qa/suites/rgw/multisite/valgrind.yaml index 0b28c18306508..76fe61e81ea70 100644 --- a/qa/suites/rgw/multisite/valgrind.yaml +++ b/qa/suites/rgw/multisite/valgrind.yaml @@ -1,3 +1,6 @@ +# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126 +os_type: centos + overrides: install: ceph: diff --git a/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml b/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml index 851b67be6c6a6..bed9f0e1900c2 100644 --- a/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml +++ b/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml @@ -1,3 +1,6 @@ +# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126 +os_type: centos + tasks: - install: flavor: notcmalloc diff --git a/qa/suites/rgw/verify/tasks/rgw_swift.yaml b/qa/suites/rgw/verify/tasks/rgw_swift.yaml index 792fb848a9ebc..9b3aa6febdc92 100644 --- a/qa/suites/rgw/verify/tasks/rgw_swift.yaml +++ b/qa/suites/rgw/verify/tasks/rgw_swift.yaml @@ -1,3 +1,6 @@ +# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126 +os_type: centos + tasks: - install: flavor: notcmalloc diff --git a/qa/suites/rgw/verify/validater/valgrind.yaml b/qa/suites/rgw/verify/validater/valgrind.yaml index dc63731b1d2c4..73f1e2e831dd1 100644 --- a/qa/suites/rgw/verify/validater/valgrind.yaml +++ b/qa/suites/rgw/verify/validater/valgrind.yaml @@ -1,3 +1,6 @@ +# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126 +os_type: centos + overrides: install: ceph: -- 2.47.3