qa: enable dashboard tests to be run with "--suite rados/dashboard"

This moves dashboard.yaml from rados/mgr into a new, separate rados/dashboard
suite. The common elements it uses are moved from rados/mgr into qa/ and
replaced with symlinks.

Fixes: https://tracker.ceph.com/issues/41820
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 493ee6d78ff90c4c3d81f5c7edac6d06fbe3d295)

diff --git a/qa/clusters/2-node-mgr.yaml b/qa/clusters/2-node-mgr.yaml
new file mode 100644 (file)
index 0000000..b1c29a8
--- /dev/null
+++ b/qa/clusters/2-node-mgr.yaml
@@ -0,0 +1,10 @@
+roles:
+- [mgr.x, mon.a, mon.c, mds.a, mds.c, osd.0, client.0]
+- [mgr.y, mgr.z, mon.b, mds.b, osd.1, osd.2, osd.3, client.1]
+log-rotate:
+  ceph-mds: 10G
+  ceph-osd: 10G
+openstack:
+  - volumes: # attached to each instance
+      count: 2
+      size: 30 # GB

diff --git a/qa/debug/mgr.yaml b/qa/debug/mgr.yaml
new file mode 100644 (file)
index 0000000..068021e
--- /dev/null
+++ b/qa/debug/mgr.yaml
@@ -0,0 +1,16 @@
+overrides:
+  ceph:
+    conf:
+      mon:
+        debug mon: 20
+      mgr:
+        debug mgr: 20
+        debug ms: 1
+      client:
+        debug client: 20
+        debug mgrc: 20
+        debug ms: 1
+      osd:
+        debug mgrc: 20
+      mds:
+        debug mgrc: 20

diff --git a/qa/suites/rados/dashboard/% b/qa/suites/rados/dashboard/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/rados/dashboard/.qa b/qa/suites/rados/dashboard/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/rados/dashboard/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/rados/dashboard/clusters/+ b/qa/suites/rados/dashboard/clusters/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/rados/dashboard/clusters/.qa b/qa/suites/rados/dashboard/clusters/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/rados/dashboard/clusters/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/rados/dashboard/clusters/2-node-mgr.yaml b/qa/suites/rados/dashboard/clusters/2-node-mgr.yaml
new file mode 120000 (symlink)
index 0000000..8a0b912
--- /dev/null
+++ b/qa/suites/rados/dashboard/clusters/2-node-mgr.yaml
@@ -0,0 +1 @@
+.qa/clusters/2-node-mgr.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/dashboard/debug/.qa b/qa/suites/rados/dashboard/debug/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/rados/dashboard/debug/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/rados/dashboard/debug/mgr.yaml b/qa/suites/rados/dashboard/debug/mgr.yaml
new file mode 120000 (symlink)
index 0000000..651e5f8
--- /dev/null
+++ b/qa/suites/rados/dashboard/debug/mgr.yaml
@@ -0,0 +1 @@
+.qa/debug/mgr.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/dashboard/objectstore b/qa/suites/rados/dashboard/objectstore
new file mode 120000 (symlink)
index 0000000..c40bd32
--- /dev/null
+++ b/qa/suites/rados/dashboard/objectstore
@@ -0,0 +1 @@
+.qa/objectstore
\ No newline at end of file

diff --git a/qa/suites/rados/dashboard/supported-random-distro$ b/qa/suites/rados/dashboard/supported-random-distro$
new file mode 120000 (symlink)
index 0000000..7cef21e
--- /dev/null
+++ b/qa/suites/rados/dashboard/supported-random-distro$
@@ -0,0 +1 @@
+../basic/supported-random-distro$
\ No newline at end of file

diff --git a/qa/suites/rados/dashboard/tasks/.qa b/qa/suites/rados/dashboard/tasks/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/rados/dashboard/tasks/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/rados/dashboard/tasks/dashboard.yaml b/qa/suites/rados/dashboard/tasks/dashboard.yaml
new file mode 100644 (file)
index 0000000..ad6adc7
--- /dev/null
+++ b/qa/suites/rados/dashboard/tasks/dashboard.yaml
@@ -0,0 +1,51 @@
+
+tasks:
+  - install:
+  - ceph:
+      # tests may leave mgrs broken, so don't try and call into them
+      # to invoke e.g. pg dump during teardown.
+      wait-for-scrub: false
+      log-whitelist:
+        - overall HEALTH_
+        - \(MGR_DOWN\)
+        - \(PG_
+        - replacing it with standby
+        - No standby daemons available
+        - \(FS_DEGRADED\)
+        - \(MDS_FAILED\)
+        - \(MDS_DEGRADED\)
+        - \(FS_WITH_FAILED_MDS\)
+        - \(MDS_DAMAGE\)
+        - \(MDS_ALL_DOWN\)
+        - \(MDS_UP_LESS_THAN_MAX\)
+        - \(OSD_DOWN\)
+        - \(OSD_HOST_DOWN\)
+        - \(POOL_APP_NOT_ENABLED\)
+        - pauserd,pausewr flag\(s\) set
+        - Monitor daemon marked osd\.[[:digit:]]+ down, but it is still running
+        - evicting unresponsive client .+
+  - rgw: [client.0]
+  - cephfs_test_runner:
+      fail_on_skip: false
+      modules:
+        - tasks.mgr.test_dashboard
+        - tasks.mgr.dashboard.test_auth
+        - tasks.mgr.dashboard.test_cephfs
+        - tasks.mgr.dashboard.test_cluster_configuration
+        - tasks.mgr.dashboard.test_health
+        - tasks.mgr.dashboard.test_host
+        - tasks.mgr.dashboard.test_logs
+        - tasks.mgr.dashboard.test_monitor
+        - tasks.mgr.dashboard.test_osd
+        - tasks.mgr.dashboard.test_perf_counters
+        - tasks.mgr.dashboard.test_summary
+        - tasks.mgr.dashboard.test_rgw
+        - tasks.mgr.dashboard.test_rbd
+        - tasks.mgr.dashboard.test_pool
+        - tasks.mgr.dashboard.test_requests
+        - tasks.mgr.dashboard.test_role
+        - tasks.mgr.dashboard.test_settings
+        - tasks.mgr.dashboard.test_user
+        - tasks.mgr.dashboard.test_erasure_code_profile
+        - tasks.mgr.dashboard.test_mgr_module
+        - tasks.mgr.dashboard.test_ganesha

diff --git a/qa/suites/rados/mgr/clusters/2-node-mgr.yaml b/qa/suites/rados/mgr/clusters/2-node-mgr.yaml
deleted file mode 100644 (file)
index 906c59707ec657329cc81bc2a727d12c212a8c22..0000000000000000000000000000000000000000
--- a/qa/suites/rados/mgr/clusters/2-node-mgr.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-roles:
-- [mgr.x, mon.a, mon.c, mds.a, mds.c, osd.0, client.0]
-- [mgr.y, mgr.z, mon.b, mds.b, osd.1, osd.2, osd.3, client.1]
-log-rotate:
-  ceph-mds: 10G
-  ceph-osd: 10G

diff --git a/qa/suites/rados/mgr/clusters/2-node-mgr.yaml b/qa/suites/rados/mgr/clusters/2-node-mgr.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..8a0b9123b38259f2005204afd0c3050f7d4dcb1a
--- /dev/null
+++ b/qa/suites/rados/mgr/clusters/2-node-mgr.yaml
@@ -0,0 +1 @@
+.qa/clusters/2-node-mgr.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/mgr/clusters/openstack.yaml b/qa/suites/rados/mgr/clusters/openstack.yaml
deleted file mode 100644 (file)
index 21eca2b..0000000
--- a/qa/suites/rados/mgr/clusters/openstack.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-openstack:
-  - volumes: # attached to each instance
-      count: 2
-      size: 30 # GB

diff --git a/qa/suites/rados/mgr/debug/mgr.yaml b/qa/suites/rados/mgr/debug/mgr.yaml
deleted file mode 100644 (file)
index 068021eb6c7cb24c3c8c840c66bb2c2a02936147..0000000000000000000000000000000000000000
--- a/qa/suites/rados/mgr/debug/mgr.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      mon:
-        debug mon: 20
-      mgr:
-        debug mgr: 20
-        debug ms: 1
-      client:
-        debug client: 20
-        debug mgrc: 20
-        debug ms: 1
-      osd:
-        debug mgrc: 20
-      mds:
-        debug mgrc: 20

diff --git a/qa/suites/rados/mgr/debug/mgr.yaml b/qa/suites/rados/mgr/debug/mgr.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..651e5f8a89e68fcf56ab453e40db0f451b30300d
--- /dev/null
+++ b/qa/suites/rados/mgr/debug/mgr.yaml
@@ -0,0 +1 @@
+.qa/debug/mgr.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/mgr/tasks/dashboard.yaml b/qa/suites/rados/mgr/tasks/dashboard.yaml
deleted file mode 100644 (file)
index ad6adc7..0000000
--- a/qa/suites/rados/mgr/tasks/dashboard.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-tasks:
-  - install:
-  - ceph:
-      # tests may leave mgrs broken, so don't try and call into them
-      # to invoke e.g. pg dump during teardown.
-      wait-for-scrub: false
-      log-whitelist:
-        - overall HEALTH_
-        - \(MGR_DOWN\)
-        - \(PG_
-        - replacing it with standby
-        - No standby daemons available
-        - \(FS_DEGRADED\)
-        - \(MDS_FAILED\)
-        - \(MDS_DEGRADED\)
-        - \(FS_WITH_FAILED_MDS\)
-        - \(MDS_DAMAGE\)
-        - \(MDS_ALL_DOWN\)
-        - \(MDS_UP_LESS_THAN_MAX\)
-        - \(OSD_DOWN\)
-        - \(OSD_HOST_DOWN\)
-        - \(POOL_APP_NOT_ENABLED\)
-        - pauserd,pausewr flag\(s\) set
-        - Monitor daemon marked osd\.[[:digit:]]+ down, but it is still running
-        - evicting unresponsive client .+
-  - rgw: [client.0]
-  - cephfs_test_runner:
-      fail_on_skip: false
-      modules:
-        - tasks.mgr.test_dashboard
-        - tasks.mgr.dashboard.test_auth
-        - tasks.mgr.dashboard.test_cephfs
-        - tasks.mgr.dashboard.test_cluster_configuration
-        - tasks.mgr.dashboard.test_health
-        - tasks.mgr.dashboard.test_host
-        - tasks.mgr.dashboard.test_logs
-        - tasks.mgr.dashboard.test_monitor
-        - tasks.mgr.dashboard.test_osd
-        - tasks.mgr.dashboard.test_perf_counters
-        - tasks.mgr.dashboard.test_summary
-        - tasks.mgr.dashboard.test_rgw
-        - tasks.mgr.dashboard.test_rbd
-        - tasks.mgr.dashboard.test_pool
-        - tasks.mgr.dashboard.test_requests
-        - tasks.mgr.dashboard.test_role
-        - tasks.mgr.dashboard.test_settings
-        - tasks.mgr.dashboard.test_user
-        - tasks.mgr.dashboard.test_erasure_code_profile
-        - tasks.mgr.dashboard.test_mgr_module
-        - tasks.mgr.dashboard.test_ganesha