mgr/dashboard: fix cephadm e2e test failure on deleting OSDs

- Adapt the OSD ID column change in this PR:
  https://github.com/ceph/ceph/pull/37506
- Turn off Cypress retries because it makes the failure log misleading.

Fixes: https://tracker.ceph.com/issues/48209
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>

diff --git a/qa/workunits/cephadm/test_dashboard_e2e.sh b/qa/workunits/cephadm/test_dashboard_e2e.sh
index 34633404723b85076d0d3dab5173f6929f784e14..9e1da387d4c55dc24482bc191f00f1c62130ad81 100755 (executable)
--- a/qa/workunits/cephadm/test_dashboard_e2e.sh
+++ b/qa/workunits/cephadm/test_dashboard_e2e.sh
@@ -47,7 +47,7 @@ EOF
 cypress_run () {
     local specs="$1"
     local timeout="$2"
-    local override_config="ignoreTestFiles=*.po.ts,testFiles=${specs}"
+    local override_config="ignoreTestFiles=*.po.ts,retries=0,testFiles=${specs}"
 
     if [ x"$timeout" != "x" ]; then
         override_config="${override_config},defaultCommandTimeout=${timeout}"

diff --git a/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/osds.po.ts b/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/osds.po.ts
index 7e0da4e7ea00e9b8f9ca39c10a9690718ee13f67..7cd738b822e7f8c50123762f1f4a158ea28e23af 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/osds.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/osds.po.ts
@@ -9,7 +9,7 @@ export class OSDsPageHelper extends PageHelper {
   pages = pages;
 
   columnIndex = {
-    id: 4,
+    id: 3,
     status: 5
   };