From fe9963b03cb97867df0263462223771cce2279fe Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Wed, 23 Jun 2021 09:49:28 -0500
Subject: [PATCH] qa/suites/rados/dashboard: fix e2e test

Move roles into task yaml.  Rename e2e.

Fixes: https://tracker.ceph.com/issues/51292
Signed-off-by: Sage Weil <sage@newdream.net>
---
 qa/suites/rados/dashboard/clusters/+          |  0
 qa/suites/rados/dashboard/clusters/.qa        |  1 -
 .../rados/dashboard/clusters/2-node-mgr.yaml  |  1 -
 .../rados/dashboard/tasks/dashboard.yaml      |  3 +++
 qa/suites/rados/dashboard/tasks/e2e.yaml      | 23 +++++++++++++++++++
 qa/suites/rados/dashboard/tasks/test_e2e.yaml | 11 ---------
 6 files changed, 26 insertions(+), 13 deletions(-)
 delete mode 100644 qa/suites/rados/dashboard/clusters/+
 delete mode 120000 qa/suites/rados/dashboard/clusters/.qa
 delete mode 120000 qa/suites/rados/dashboard/clusters/2-node-mgr.yaml
 create mode 100644 qa/suites/rados/dashboard/tasks/e2e.yaml
 delete mode 100644 qa/suites/rados/dashboard/tasks/test_e2e.yaml

diff --git a/qa/suites/rados/dashboard/clusters/+ b/qa/suites/rados/dashboard/clusters/+
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/qa/suites/rados/dashboard/clusters/.qa b/qa/suites/rados/dashboard/clusters/.qa
deleted file mode 120000
index a602a0353e751..0000000000000
--- a/qa/suites/rados/dashboard/clusters/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.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
deleted file mode 120000
index 8a0b9123b3825..0000000000000
--- a/qa/suites/rados/dashboard/clusters/2-node-mgr.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/clusters/2-node-mgr.yaml
\ No newline at end of file
diff --git a/qa/suites/rados/dashboard/tasks/dashboard.yaml b/qa/suites/rados/dashboard/tasks/dashboard.yaml
index 111c5f38e2a17..052e2cc388142 100644
--- a/qa/suites/rados/dashboard/tasks/dashboard.yaml
+++ b/qa/suites/rados/dashboard/tasks/dashboard.yaml
@@ -1,3 +1,6 @@
+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]
 
 tasks:
   - install:
diff --git a/qa/suites/rados/dashboard/tasks/e2e.yaml b/qa/suites/rados/dashboard/tasks/e2e.yaml
new file mode 100644
index 0000000000000..cb6ffb22fe0cc
--- /dev/null
+++ b/qa/suites/rados/dashboard/tasks/e2e.yaml
@@ -0,0 +1,23 @@
+roles:
+# 3 osd roles on host.a is required for cephadm task. It checks if the cluster is healthy.
+# More daemons will be deployed on both hosts in e2e tests.
+- - host.a
+  - osd.0
+  - osd.1
+  - osd.2
+  - mon.a
+  - mgr.a
+  - client.0
+- - host.b
+  - client.1
+tasks:
+- install:
+- cephadm:
+- workunit:
+    clients:
+      client.1:
+        - cephadm/create_iscsi_disks.sh
+- workunit:
+    clients:
+      client.0:
+        - cephadm/test_dashboard_e2e.sh
diff --git a/qa/suites/rados/dashboard/tasks/test_e2e.yaml b/qa/suites/rados/dashboard/tasks/test_e2e.yaml
deleted file mode 100644
index c3f081a264d04..0000000000000
--- a/qa/suites/rados/dashboard/tasks/test_e2e.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- install:
-- cephadm:
-- workunit:
-    clients:
-      client.1:
-        - cephadm/create_iscsi_disks.sh
-- workunit:
-    clients:
-      client.0:
-        - cephadm/test_dashboard_e2e.sh
-- 
2.39.5