From 0c238c2704f09369449df380f6c9fcc9195d7b8f Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Mon, 14 Jan 2019 16:54:11 -0800 Subject: [PATCH] qa/rgw/tempest: either force os_type or select random distro Fixes: https://tracker.ceph.com/issues/37885 Signed-off-by: Yehuda Sadeh --- qa/suites/rgw/tempest/distro/.qa | 1 + qa/suites/rgw/tempest/{ => distro}/supported-random-distro$ | 0 qa/suites/rgw/tempest/distro/valgrind.yaml | 5 +++++ qa/suites/rgw/tempest/tasks/rgw_tempest.yaml | 3 --- 4 files changed, 6 insertions(+), 3 deletions(-) create mode 120000 qa/suites/rgw/tempest/distro/.qa rename qa/suites/rgw/tempest/{ => distro}/supported-random-distro$ (100%) create mode 100644 qa/suites/rgw/tempest/distro/valgrind.yaml diff --git a/qa/suites/rgw/tempest/distro/.qa b/qa/suites/rgw/tempest/distro/.qa new file mode 120000 index 00000000000..a23f7e04583 --- /dev/null +++ b/qa/suites/rgw/tempest/distro/.qa @@ -0,0 +1 @@ +../../.qa \ No newline at end of file diff --git a/qa/suites/rgw/tempest/supported-random-distro$ b/qa/suites/rgw/tempest/distro/supported-random-distro$ similarity index 100% rename from qa/suites/rgw/tempest/supported-random-distro$ rename to qa/suites/rgw/tempest/distro/supported-random-distro$ diff --git a/qa/suites/rgw/tempest/distro/valgrind.yaml b/qa/suites/rgw/tempest/distro/valgrind.yaml new file mode 100644 index 00000000000..b66021bfabb --- /dev/null +++ b/qa/suites/rgw/tempest/distro/valgrind.yaml @@ -0,0 +1,5 @@ +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 47992b8c21b..f9a8a50ce87 100644 --- a/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml +++ b/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml @@ -1,6 +1,4 @@ # see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126 -os_type: centos - tasks: - install: flavor: notcmalloc @@ -31,7 +29,6 @@ tasks: description: Swift Service - rgw: client.0: - valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214 frontend_prefix: /swift use-keystone-role: client.0 - tempest: