From 702149824d2f0a169719b94c0a4e18011fb72c7c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 17 Dec 2019 10:52:37 -0600 Subject: [PATCH] qa/suites/rgw: disable valgrind for tests that require py2/ubuntu Signed-off-by: Sage Weil (cherry picked from commit ea21829ae728354b759f117e9af8a20eb8213687) Conflicts: qa/suites/rgw/website/overrides.yaml qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/7-final-workload/.qa: trivial resolution --- qa/suites/rgw/multisite/tasks/test_multi.yaml | 12 +++++++----- qa/suites/rgw/multisite/valgrind.yaml | 14 ++++++++------ qa/suites/rgw/tempest/distro/.qa | 1 - .../tempest/distro/supported-random-distro$ | 1 - qa/suites/rgw/tempest/distro/valgrind.yaml | 5 ----- qa/suites/rgw/tempest/tasks/rgw_tempest.yaml | 3 +++ qa/suites/rgw/tempest/ubuntu_latest.yaml | 1 + qa/suites/rgw/verify/tasks/0-install.yaml | 8 +++++--- qa/suites/rgw/verify/tasks/swift.yaml | 3 +++ qa/suites/rgw/verify/validater/valgrind.yaml | 18 ++++++++++-------- 10 files changed, 37 insertions(+), 29 deletions(-) delete mode 120000 qa/suites/rgw/tempest/distro/.qa delete mode 120000 qa/suites/rgw/tempest/distro/supported-random-distro$ delete mode 100644 qa/suites/rgw/tempest/distro/valgrind.yaml create mode 120000 qa/suites/rgw/tempest/ubuntu_latest.yaml diff --git a/qa/suites/rgw/multisite/tasks/test_multi.yaml b/qa/suites/rgw/multisite/tasks/test_multi.yaml index 22b292f8d774f..3247f241619bb 100644 --- a/qa/suites/rgw/multisite/tasks/test_multi.yaml +++ b/qa/suites/rgw/multisite/tasks/test_multi.yaml @@ -1,5 +1,7 @@ # 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 tasks: - install: @@ -8,16 +10,16 @@ tasks: - rgw: c1.client.0: port: 8000 - valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214 +# valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214 c1.client.1: port: 8001 - valgrind: [--tool=memcheck, --max-threads=1024] +# valgrind: [--tool=memcheck, --max-threads=1024] c2.client.0: port: 8000 - valgrind: [--tool=memcheck, --max-threads=1024] +# valgrind: [--tool=memcheck, --max-threads=1024] c2.client.1: port: 8001 - valgrind: [--tool=memcheck, --max-threads=1024] +# valgrind: [--tool=memcheck, --max-threads=1024] - rgw-multisite: - rgw-multisite-tests: config: diff --git a/qa/suites/rgw/multisite/valgrind.yaml b/qa/suites/rgw/multisite/valgrind.yaml index 99489951b4a9b..d6686ef2a2122 100644 --- a/qa/suites/rgw/multisite/valgrind.yaml +++ b/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] diff --git a/qa/suites/rgw/tempest/distro/.qa b/qa/suites/rgw/tempest/distro/.qa deleted file mode 120000 index a23f7e045836b..0000000000000 --- a/qa/suites/rgw/tempest/distro/.qa +++ /dev/null @@ -1 +0,0 @@ -../../.qa \ No newline at end of file diff --git a/qa/suites/rgw/tempest/distro/supported-random-distro$ b/qa/suites/rgw/tempest/distro/supported-random-distro$ deleted file mode 120000 index 0862b4457b37a..0000000000000 --- a/qa/suites/rgw/tempest/distro/supported-random-distro$ +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported-random-distro$ \ No newline at end of file diff --git a/qa/suites/rgw/tempest/distro/valgrind.yaml b/qa/suites/rgw/tempest/distro/valgrind.yaml deleted file mode 100644 index b66021bfabb32..0000000000000 --- a/qa/suites/rgw/tempest/distro/valgrind.yaml +++ /dev/null @@ -1,5 +0,0 @@ -os_type: centos -overrides: - rgw: - client.0: - valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214 diff --git a/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml b/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml index f0d9070cad8f8..ad2de4858b561 100644 --- a/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml +++ b/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml @@ -1,3 +1,6 @@ +# ubuntu for py2 until we move to py3 +os_type: ubuntu + # see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126 tasks: - install: diff --git a/qa/suites/rgw/tempest/ubuntu_latest.yaml b/qa/suites/rgw/tempest/ubuntu_latest.yaml new file mode 120000 index 0000000000000..3a09f9abb05ca --- /dev/null +++ b/qa/suites/rgw/tempest/ubuntu_latest.yaml @@ -0,0 +1 @@ +.qa/distros/supported/ubuntu_latest.yaml \ No newline at end of file diff --git a/qa/suites/rgw/verify/tasks/0-install.yaml b/qa/suites/rgw/verify/tasks/0-install.yaml index d623bbb3493f5..f1955a384f50e 100644 --- a/qa/suites/rgw/verify/tasks/0-install.yaml +++ b/qa/suites/rgw/verify/tasks/0-install.yaml @@ -1,14 +1,16 @@ # 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 tasks: - install: - flavor: notcmalloc +# flavor: notcmalloc - ceph: - openssl_keys: - rgw: client.0: - valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214 +# valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214 overrides: ceph: diff --git a/qa/suites/rgw/verify/tasks/swift.yaml b/qa/suites/rgw/verify/tasks/swift.yaml index dcb1c1ac318e2..4110d899d9a38 100644 --- a/qa/suites/rgw/verify/tasks/swift.yaml +++ b/qa/suites/rgw/verify/tasks/swift.yaml @@ -1,3 +1,6 @@ +# py2 for swift until we move to py3 +os_type: ubuntu + tasks: - swift: client.0: diff --git a/qa/suites/rgw/verify/validater/valgrind.yaml b/qa/suites/rgw/verify/validater/valgrind.yaml index 442bba879fa5a..bb71c7714a30e 100644 --- a/qa/suites/rgw/verify/validater/valgrind.yaml +++ b/qa/suites/rgw/verify/validater/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 #debuginfo: true ceph: conf: @@ -14,9 +16,9 @@ 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] -# https://tracker.ceph.com/issues/38621 -# mgr: [--tool=memcheck] +# valgrind: +# mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes] +# osd: [--tool=memcheck] +# mds: [--tool=memcheck] +## https://tracker.ceph.com/issues/38621 +## mgr: [--tool=memcheck] -- 2.39.5