From 146a84058ce61adc0c91134f103fc3a771e7e1f2 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Tue, 17 Sep 2019 18:11:11 +0200 Subject: [PATCH] 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 (cherry picked from commit 493ee6d78ff90c4c3d81f5c7edac6d06fbe3d295) --- qa/clusters/2-node-mgr.yaml | 10 ++++++++++ qa/debug/mgr.yaml | 16 ++++++++++++++++ qa/suites/rados/dashboard/% | 0 qa/suites/rados/dashboard/.qa | 1 + qa/suites/rados/dashboard/clusters/+ | 0 qa/suites/rados/dashboard/clusters/.qa | 1 + .../rados/dashboard/clusters/2-node-mgr.yaml | 1 + qa/suites/rados/dashboard/debug/.qa | 1 + qa/suites/rados/dashboard/debug/mgr.yaml | 1 + qa/suites/rados/dashboard/objectstore | 1 + .../rados/dashboard/supported-random-distro$ | 1 + qa/suites/rados/dashboard/tasks/.qa | 1 + .../{mgr => dashboard}/tasks/dashboard.yaml | 0 qa/suites/rados/mgr/clusters/2-node-mgr.yaml | 7 +------ qa/suites/rados/mgr/clusters/openstack.yaml | 4 ---- qa/suites/rados/mgr/debug/mgr.yaml | 17 +---------------- 16 files changed, 36 insertions(+), 26 deletions(-) create mode 100644 qa/clusters/2-node-mgr.yaml create mode 100644 qa/debug/mgr.yaml create mode 100644 qa/suites/rados/dashboard/% create mode 120000 qa/suites/rados/dashboard/.qa create mode 100644 qa/suites/rados/dashboard/clusters/+ create mode 120000 qa/suites/rados/dashboard/clusters/.qa create mode 120000 qa/suites/rados/dashboard/clusters/2-node-mgr.yaml create mode 120000 qa/suites/rados/dashboard/debug/.qa create mode 120000 qa/suites/rados/dashboard/debug/mgr.yaml create mode 120000 qa/suites/rados/dashboard/objectstore create mode 120000 qa/suites/rados/dashboard/supported-random-distro$ create mode 120000 qa/suites/rados/dashboard/tasks/.qa rename qa/suites/rados/{mgr => dashboard}/tasks/dashboard.yaml (100%) mode change 100644 => 120000 qa/suites/rados/mgr/clusters/2-node-mgr.yaml delete mode 100644 qa/suites/rados/mgr/clusters/openstack.yaml mode change 100644 => 120000 qa/suites/rados/mgr/debug/mgr.yaml diff --git a/qa/clusters/2-node-mgr.yaml b/qa/clusters/2-node-mgr.yaml new file mode 100644 index 0000000000000..b1c29a866385e --- /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 index 0000000000000..068021eb6c7cb --- /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 index 0000000000000..e69de29bb2d1d diff --git a/qa/suites/rados/dashboard/.qa b/qa/suites/rados/dashboard/.qa new file mode 120000 index 0000000000000..a602a0353e751 --- /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 index 0000000000000..e69de29bb2d1d diff --git a/qa/suites/rados/dashboard/clusters/.qa b/qa/suites/rados/dashboard/clusters/.qa new file mode 120000 index 0000000000000..a602a0353e751 --- /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 index 0000000000000..8a0b9123b3825 --- /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 index 0000000000000..a602a0353e751 --- /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 index 0000000000000..651e5f8a89e68 --- /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 index 0000000000000..c40bd32614533 --- /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 index 0000000000000..7cef21eeffd25 --- /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 index 0000000000000..a602a0353e751 --- /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/mgr/tasks/dashboard.yaml b/qa/suites/rados/dashboard/tasks/dashboard.yaml similarity index 100% rename from qa/suites/rados/mgr/tasks/dashboard.yaml rename to qa/suites/rados/dashboard/tasks/dashboard.yaml 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 index 906c59707ec65..0000000000000 --- 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 index 0000000000000..8a0b9123b3825 --- /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 index 21eca2bbd057d..0000000000000 --- 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 index 068021eb6c7cb..0000000000000 --- 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 index 0000000000000..651e5f8a89e68 --- /dev/null +++ b/qa/suites/rados/mgr/debug/mgr.yaml @@ -0,0 +1 @@ +.qa/debug/mgr.yaml \ No newline at end of file -- 2.47.3