Merge pull request #40821 from cbodley/wip-50218

qa/rgw: use symlinks to specify distro

Reviewed-by: Ali Maredia <amaredia@redhat.com>

31 files changed, 32 insertions, 151 deletions

diff --git a/qa/suites/rgw/crypt/supported-random-distro$ b/qa/suites/rgw/crypt/supported-random-distro$
new file mode 120000
index 00000000000..0862b4457b3
--- /dev/null
+++ b/qa/suites/rgw/crypt/supported-random-distro$
@@ -0,0 +1 @@
+.qa/distros/supported-random-distro$
\ No newline at end of file
diff --git a/qa/suites/rgw/multifs/tasks/rgw_bucket_quota.yaml b/qa/suites/rgw/multifs/tasks/rgw_bucket_quota.yaml
index eb4a67ea0aa..e07c8b5ccfe 100644
--- a/qa/suites/rgw/multifs/tasks/rgw_bucket_quota.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_bucket_quota.yaml
@@ -1,5 +1,3 @@
-# Amazon/S3.pm (cpan) not available as an rpm
-os_type: ubuntu
 tasks:
 - install:
 - ceph:
diff --git a/qa/suites/rgw/multifs/tasks/rgw_multipart_upload.yaml b/qa/suites/rgw/multifs/tasks/rgw_multipart_upload.yaml
index f7e561f0731..bac4f401626 100644
--- a/qa/suites/rgw/multifs/tasks/rgw_multipart_upload.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_multipart_upload.yaml
@@ -1,5 +1,3 @@
-# Amazon::S3 is not available on el7
-os_type: ubuntu
 tasks:
 - install:
 - ceph:
diff --git a/qa/suites/rgw/multifs/tasks/rgw_user_quota.yaml b/qa/suites/rgw/multifs/tasks/rgw_user_quota.yaml
index e661ff33d10..92c63d2e850 100644
--- a/qa/suites/rgw/multifs/tasks/rgw_user_quota.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_user_quota.yaml
@@ -1,5 +1,3 @@
-# Amazon/S3.pm (cpan) not available as an rpm
-os_type: ubuntu
 tasks:
 - install:
 - ceph:
diff --git a/qa/suites/rgw/multifs/ubuntu_latest.yaml b/qa/suites/rgw/multifs/ubuntu_latest.yaml
new file mode 120000
index 00000000000..3a09f9abb05
--- /dev/null
+++ b/qa/suites/rgw/multifs/ubuntu_latest.yaml
@@ -0,0 +1 @@
+.qa/distros/supported/ubuntu_latest.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/multisite/supported-random-distro$ b/qa/suites/rgw/multisite/supported-random-distro$
new file mode 120000
index 00000000000..0862b4457b3
--- /dev/null
+++ b/qa/suites/rgw/multisite/supported-random-distro$
@@ -0,0 +1 @@
+.qa/distros/supported-random-distro$
\ No newline at end of file
diff --git a/qa/suites/rgw/multisite/tasks/test_multi.yaml b/qa/suites/rgw/multisite/tasks/test_multi.yaml
index 3247f241619..1a65a67b5aa 100644
--- a/qa/suites/rgw/multisite/tasks/test_multi.yaml
+++ b/qa/suites/rgw/multisite/tasks/test_multi.yaml
@@ -1,8 +1,3 @@
-# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
-#os_type: centos
-# ubuntu and no valgrind until we migrate test to py3
-os_type: ubuntu
-
 tasks:
 - install:
 - ceph: {cluster: c1}
@@ -10,16 +5,12 @@ tasks:
 - rgw:
     c1.client.0:
       port: 8000
-#      valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214
     c1.client.1:
       port: 8001
-#      valgrind: [--tool=memcheck, --max-threads=1024]
     c2.client.0:
       port: 8000
-#      valgrind: [--tool=memcheck, --max-threads=1024]
     c2.client.1:
       port: 8001
-#      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
deleted file mode 100644
index 71c56fae467..00000000000
--- a/qa/suites/rgw/multisite/valgrind.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
-#os_type: centos
-# ubuntu and no valgrind until we migrate test to py3
-os_type: ubuntu
-
-overrides:
-  install:
-    ceph:
-  ceph:
-    conf:
-      global:
-        osd heartbeat grace: 40
-      mon:
-        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]
diff --git a/qa/suites/rgw/multisite/valgrind.yaml.disabled b/qa/suites/rgw/multisite/valgrind.yaml.disabled
new file mode 100644
index 00000000000..36e20f02c3e
--- /dev/null
+++ b/qa/suites/rgw/multisite/valgrind.yaml.disabled
@@ -0,0 +1,20 @@
+overrides:
+  install:
+    ceph:
+  ceph:
+    conf:
+      global:
+        osd heartbeat grace: 40
+      mon:
+        mon osd crush smoke test: false
+      osd:
+        osd fast shutdown: false
+  rgw:
+    c1.client.0:
+      valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214
+    c1.client.1:
+      valgrind: [--tool=memcheck, --max-threads=1024]
+    c2.client.0:
+      valgrind: [--tool=memcheck, --max-threads=1024]
+    c2.client.1:
+      valgrind: [--tool=memcheck, --max-threads=1024]
diff --git a/qa/suites/rgw/notifications/tasks/0-install.yaml b/qa/suites/rgw/notifications/tasks/0-install.yaml
index 5ebe67269f3..013ccbd26fe 100644
--- a/qa/suites/rgw/notifications/tasks/0-install.yaml
+++ b/qa/suites/rgw/notifications/tasks/0-install.yaml
@@ -1,14 +1,9 @@
-# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
-os_type: centos
-
 tasks:
 - install:
-#    flavor: notcmalloc
 - ceph:
 - openssl_keys:
 - rgw:
     client.0:
-#      valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214
 
 overrides:
   ceph:
diff --git a/qa/suites/rgw/sts/centos_latest.yaml b/qa/suites/rgw/sts/centos_latest.yaml
deleted file mode 100644
index 24ae800744f..00000000000
--- a/qa/suites/rgw/sts/centos_latest.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-os_type: centos
-os_version: "8.1"
-overrides:
-  selinux:
-    whitelist:
-      - scontext=system_u:system_r:logrotate_t:s0
diff --git a/qa/suites/rgw/sts/cluster.yaml b/qa/suites/rgw/sts/cluster.yaml
new file mode 120000
index 00000000000..230ff0fdab4
--- /dev/null
+++ b/qa/suites/rgw/sts/cluster.yaml
@@ -0,0 +1 @@
+.qa/clusters/fixed-2.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/sts/clusters/fixed-2.yaml b/qa/suites/rgw/sts/clusters/fixed-2.yaml
deleted file mode 100644
index e4448bb2008..00000000000
--- a/qa/suites/rgw/sts/clusters/fixed-2.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-roles:
-- [mon.a, mon.c, mgr.y, osd.0, osd.1, osd.2, osd.3, client.0, node-exporter.a]
-- [mon.b, mgr.x, osd.4, osd.5, osd.6, osd.7, client.1, prometheus.a, node-exporter.b]
-openstack:
-- volumes: # attached to each instance
-    count: 4
-    size: 10 # GB
-overrides:
-  ceph:
-    conf:
-      osd:
-        osd shutdown pgref assert: true
diff --git a/qa/suites/rgw/sts/frontend/civetweb.yaml b/qa/suites/rgw/sts/frontend/civetweb.yaml
deleted file mode 100644
index 57e8cc44fd8..00000000000
--- a/qa/suites/rgw/sts/frontend/civetweb.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  rgw:
-    frontend: civetweb
diff --git a/qa/suites/rgw/sts/objectstore.yaml b/qa/suites/rgw/sts/objectstore.yaml
new file mode 120000
index 00000000000..a59cf517506
--- /dev/null
+++ b/qa/suites/rgw/sts/objectstore.yaml
@@ -0,0 +1 @@
+.qa/objectstore/bluestore-bitmap.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/sts/objectstore/bluestore-bitmap.yaml b/qa/suites/rgw/sts/objectstore/bluestore-bitmap.yaml
deleted file mode 100644
index 69c37aced67..00000000000
--- a/qa/suites/rgw/sts/objectstore/bluestore-bitmap.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-overrides:
-  thrashosds:
-    bdev_inject_crash: 2
-    bdev_inject_crash_probability: .5
-  ceph:
-    fs: xfs
-    conf:
-      osd:
-        osd objectstore: bluestore
-        bluestore block size: 96636764160
-        debug bluestore: 20
-        debug bluefs: 20
-        debug rocksdb: 10
-        bluestore fsck on mount: true
-        bluestore allocator: bitmap
-        # lower the full ratios since we can fill up a 100gb osd so quickly
-        mon osd full ratio: .9
-        mon osd backfillfull_ratio: .85
-        mon osd nearfull ratio: .8
-        osd failsafe full ratio: .95
-# this doesn't work with failures bc the log writes are not atomic across the two backends
-#        bluestore bluefs env mirror: true
-        bdev enable discard: true
-        bdev async discard: true
-  ceph-deploy:
-    fs: xfs
-    bluestore: yes
-    conf:
-      osd:
-        osd objectstore: bluestore
-        bluestore block size: 96636764160
-        debug bluestore: 20
-        debug bluefs: 20
-        debug rocksdb: 10
-        bluestore fsck on mount: true
-        # lower the full ratios since we can fill up a 100gb osd so quickly
-        mon osd full ratio: .9
-        mon osd backfillfull_ratio: .85
-        mon osd nearfull ratio: .8
-        osd failsafe full ratio: .95
-        bdev enable discard: true
-        bdev async discard: true
diff --git a/qa/suites/rgw/sts/objectstore/filestore-xfs.yaml b/qa/suites/rgw/sts/objectstore/filestore-xfs.yaml
deleted file mode 100644
index bd18aca1e5e..00000000000
--- a/qa/suites/rgw/sts/objectstore/filestore-xfs.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-overrides:
-  ceph:
-    fs: xfs
-    conf:
-      osd:
-        osd objectstore: filestore
-        osd sloppy crc: true
-  ceph-deploy:
-    fs: xfs
-    filestore: True
-    conf:
-      osd:
-        osd objectstore: filestore
-        osd sloppy crc: true
diff --git a/qa/suites/rgw/sts/pool-type.yaml b/qa/suites/rgw/sts/pool-type.yaml
new file mode 120000
index 00000000000..697b33b2043
--- /dev/null
+++ b/qa/suites/rgw/sts/pool-type.yaml
@@ -0,0 +1 @@
+.qa/rgw_pool_type/replicated.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/sts/rgw_frontend b/qa/suites/rgw/sts/rgw_frontend
new file mode 120000
index 00000000000..926a53e8383
--- /dev/null
+++ b/qa/suites/rgw/sts/rgw_frontend
@@ -0,0 +1 @@
+.qa/rgw_frontend
\ No newline at end of file
diff --git a/qa/suites/rgw/sts/rgw_pool_type/ec-profile.yaml b/qa/suites/rgw/sts/rgw_pool_type/ec-profile.yaml
deleted file mode 100644
index f6fbf35f7f9..00000000000
--- a/qa/suites/rgw/sts/rgw_pool_type/ec-profile.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-overrides:
-  rgw:
-    ec-data-pool: true
-    erasure_code_profile:
-      name: testprofile
-      k: 3
-      m: 1
-      crush-failure-domain: osd
diff --git a/qa/suites/rgw/sts/rgw_pool_type/ec.yaml b/qa/suites/rgw/sts/rgw_pool_type/ec.yaml
deleted file mode 100644
index 7c0c5e6a0a3..00000000000
--- a/qa/suites/rgw/sts/rgw_pool_type/ec.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  rgw:
-    ec-data-pool: true
diff --git a/qa/suites/rgw/sts/rgw_pool_type/replicated.yaml b/qa/suites/rgw/sts/rgw_pool_type/replicated.yaml
deleted file mode 100644
index c91709eaae7..00000000000
--- a/qa/suites/rgw/sts/rgw_pool_type/replicated.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  rgw:
-    ec-data-pool: false
diff --git a/qa/suites/rgw/sts/supported-random-distro$ b/qa/suites/rgw/sts/supported-random-distro$
new file mode 120000
index 00000000000..0862b4457b3
--- /dev/null
+++ b/qa/suites/rgw/sts/supported-random-distro$
@@ -0,0 +1 @@
+.qa/distros/supported-random-distro$
\ No newline at end of file
diff --git a/qa/suites/rgw/sts/tasks/0-install.yaml b/qa/suites/rgw/sts/tasks/0-install.yaml
index ae75c1884d9..013ccbd26fe 100644
--- a/qa/suites/rgw/sts/tasks/0-install.yaml
+++ b/qa/suites/rgw/sts/tasks/0-install.yaml
@@ -1,13 +1,9 @@
-# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
-os_type: centos
-
 tasks:
 - install:
 - ceph:
 - openssl_keys:
 - rgw:
     client.0:
-#      valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214
 
 overrides:
   ceph:
diff --git a/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml b/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml
index c08272dcd94..d6c3031b6da 100644
--- a/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml
+++ b/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml
@@ -1,7 +1,3 @@
-# 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:
 - ceph:
diff --git a/qa/suites/rgw/thrash/ubuntu_latest.yaml b/qa/suites/rgw/thrash/ubuntu_latest.yaml
new file mode 120000
index 00000000000..3a09f9abb05
--- /dev/null
+++ b/qa/suites/rgw/thrash/ubuntu_latest.yaml
@@ -0,0 +1 @@
+.qa/distros/supported/ubuntu_latest.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/thrash/workload/rgw_bucket_quota.yaml b/qa/suites/rgw/thrash/workload/rgw_bucket_quota.yaml
index eef9ca3ec65..bc441ff3265 100644
--- a/qa/suites/rgw/thrash/workload/rgw_bucket_quota.yaml
+++ b/qa/suites/rgw/thrash/workload/rgw_bucket_quota.yaml
@@ -1,5 +1,3 @@
-# Amazon/S3.pm (cpan) not available as an rpm
-os_type: ubuntu
 tasks:
 - workunit:
     clients:
diff --git a/qa/suites/rgw/thrash/workload/rgw_multipart_upload.yaml b/qa/suites/rgw/thrash/workload/rgw_multipart_upload.yaml
index f364f2d23bd..1b98f262558 100644
--- a/qa/suites/rgw/thrash/workload/rgw_multipart_upload.yaml
+++ b/qa/suites/rgw/thrash/workload/rgw_multipart_upload.yaml
@@ -1,5 +1,3 @@
-# Amazon::S3 is not available on el7
-os_type: ubuntu
 tasks:
 - workunit:
     clients:
diff --git a/qa/suites/rgw/thrash/workload/rgw_user_quota.yaml b/qa/suites/rgw/thrash/workload/rgw_user_quota.yaml
index 670ac0c170a..75ba3d4749b 100644
--- a/qa/suites/rgw/thrash/workload/rgw_user_quota.yaml
+++ b/qa/suites/rgw/thrash/workload/rgw_user_quota.yaml
@@ -1,5 +1,3 @@
-# Amazon/S3.pm (cpan) not available as an rpm
-os_type: ubuntu
 tasks:
 - workunit:
     clients:
diff --git a/qa/suites/rgw/website/overrides.yaml b/qa/suites/rgw/website/overrides.yaml
index e1ac1a98358..80397571ee1 100644
--- a/qa/suites/rgw/website/overrides.yaml
+++ b/qa/suites/rgw/website/overrides.yaml
@@ -1,7 +1,3 @@
-# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
-# letting this run on ubuntu for now, though -sage
-#os_type: centos
-
 overrides:
   install:
   ceph:
@@ -23,8 +19,8 @@ overrides:
         rgw enable apis: s3website
     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
       client.1:
-#        valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214
+        valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214
   s3tests:
     calling-format: subdomain
diff --git a/qa/suites/upgrade/pacific-x/rgw-multisite/supported-random-distro$ b/qa/suites/upgrade/pacific-x/rgw-multisite/supported-random-distro$
new file mode 120000
index 00000000000..0862b4457b3
--- /dev/null
+++ b/qa/suites/upgrade/pacific-x/rgw-multisite/supported-random-distro$
@@ -0,0 +1 @@
+.qa/distros/supported-random-distro$
\ No newline at end of file