qa/rgw/tempest: either force os_type or select random distro

Fixes: https://tracker.ceph.com/issues/37885
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/qa/suites/rgw/tempest/distro/.qa b/qa/suites/rgw/tempest/distro/.qa
new file mode 120000 (symlink)
index 0000000..a23f7e0
--- /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/distro/supported-random-distro$ b/qa/suites/rgw/tempest/distro/supported-random-distro$
new file mode 120000 (symlink)
index 0000000..0862b44
--- /dev/null
+++ b/qa/suites/rgw/tempest/distro/supported-random-distro$
@@ -0,0 +1 @@
+.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
new file mode 100644 (file)
index 0000000..b66021b
--- /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/supported-random-distro$ b/qa/suites/rgw/tempest/supported-random-distro$
deleted file mode 120000 (symlink)
index 0862b44..0000000
--- a/qa/suites/rgw/tempest/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/tasks/rgw_tempest.yaml b/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml
index 47992b8c21b9c6b17ae2486973b5ae54fb00a52e..f9a8a50ce875fef6135e2d8083df381dba40a40a 100644 (file)
--- 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: