From: Sage Weil <sage@newdream.net>
Date: Sat, 12 Jun 2021 12:52:42 +0000 (-0500)
Subject: qa: move dashboard e2e from cephadm -> rados suite
X-Git-Tag: v17.1.0~1658^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ac05b3568f19ce5e35cf0727993bd4cb1725c9fb;p=ceph.git

qa: move dashboard e2e from cephadm -> rados suite

This test fails ~20% of the time.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/qa/suites/orch/cephadm/dashboard/task/test_e2e.yaml b/qa/suites/orch/cephadm/dashboard/task/test_e2e.yaml
deleted file mode 100644
index cb6ffb22fe0c..000000000000
--- a/qa/suites/orch/cephadm/dashboard/task/test_e2e.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-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
new file mode 100644
index 000000000000..c3f081a264d0
--- /dev/null
+++ b/qa/suites/rados/dashboard/tasks/test_e2e.yaml
@@ -0,0 +1,11 @@
+tasks:
+- install:
+- cephadm:
+- workunit:
+    clients:
+      client.1:
+        - cephadm/create_iscsi_disks.sh
+- workunit:
+    clients:
+      client.0:
+        - cephadm/test_dashboard_e2e.sh