qa/rgw: use symlinks for rgw/sts suite, target supported-random-distro$

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/qa/suites/rgw/sts/centos_latest.yaml b/qa/suites/rgw/sts/centos_latest.yaml
deleted file mode 100644 (file)
index 24ae800..0000000
--- 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 (symlink)
index 0000000..230ff0f
--- /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 (file)
index e4448bb..0000000
--- 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 (file)
index 57e8cc4..0000000
--- 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 (symlink)
index 0000000..a59cf51
--- /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 (file)
index 69c37ac..0000000
--- 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 (file)
index bd18aca..0000000
--- 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 (symlink)
index 0000000..697b33b
--- /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 (symlink)
index 0000000..926a53e
--- /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 (file)
index f6fbf35..0000000
--- 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 (file)
index 7c0c5e6..0000000
--- 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 (file)
index c91709e..0000000
--- 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 (symlink)
index 0000000..0862b44
--- /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 ae75c1884d9e87fb21bcfa517368bcaa4a41db4c..013ccbd26feaf313c357d3578f879825fd8198c7 100644 (file)
--- 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: