mgr/dashboard: replace vstart with mstart in dashboard e2e

Fixes: https://tracker.ceph.com/issues/56425
Signed-off-by: Nizamudeen A <nia@redhat.com>

diff --git a/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh b/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh
index c37bf54c8761e6e833f12d20857ae30a5c6b3216..9cdbc6ac1b68cd32a6354057c2c93fac7141c155 100755 (executable)
--- a/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh
+++ b/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh
@@ -2,21 +2,38 @@
 
 set -e
 
+CLUSTERS=("1" "2")
+
+ceph() {
+    ${FULL_PATH_BUILD_DIR}/../src/mrun 1 ceph $@
+}
+
+ceph2() {
+    ${FULL_PATH_BUILD_DIR}/../src/mrun 2 ceph $@
+}
+
+ceph_all() {
+    ceph $@
+    ceph2 $@
+}
+
 start_ceph() {
     cd $FULL_PATH_BUILD_DIR
 
-    MGR=2 RGW=1 ../src/vstart.sh -n -d
-    sleep 10
+    for cluster in ${CLUSTERS[@]}; do
+        MGR=2 RGW=1 ../src/mstart.sh $cluster -n -d
+    done
 
     set -x
 
     # Create an Object Gateway User
-    ./bin/ceph dashboard set-rgw-credentials
+    ceph_all dashboard set-rgw-credentials
 
     # Set SSL verify to False
-    ./bin/ceph dashboard set-rgw-api-ssl-verify False
+    ceph_all dashboard set-rgw-api-ssl-verify False
 
-    CYPRESS_BASE_URL=$(./bin/ceph mgr services | jq -r .dashboard)
+    CYPRESS_BASE_URL=$(ceph mgr services | jq -r .dashboard)
+    CEPH2_DASHBOARD_URL=$(ceph2 mgr services | jq -r .dashboard)
 
     set +x
 }
@@ -24,7 +41,9 @@ start_ceph() {
 stop() {
     if [ "$REMOTE" == "false" ]; then
         cd ${FULL_PATH_BUILD_DIR}
-        ../src/stop.sh
+        for cluster in ${CLUSTERS[@]}; do
+            ../src/mstop.sh $cluster
+        done
     fi
     exit $1
 }
@@ -57,6 +76,7 @@ check_device_available() {
 }
 
 : ${CYPRESS_BASE_URL:=''}
+: ${CEPH2_DASHBOARD_URL:=''}
 : ${CYPRESS_LOGIN_PWD:=''}
 : ${CYPRESS_LOGIN_USER:=''}
 : ${DEVICE:="chrome"}
@@ -83,7 +103,7 @@ FULL_PATH_BUILD_DIR=`pwd`
 
 : ${CYPRESS_CACHE_FOLDER:="${FULL_PATH_BUILD_DIR}/src/pybind/mgr/dashboard/cypress"}
 
-export CYPRESS_BASE_URL CYPRESS_CACHE_FOLDER CYPRESS_LOGIN_USER CYPRESS_LOGIN_PWD NO_COLOR
+export CYPRESS_BASE_URL CYPRESS_CACHE_FOLDER CYPRESS_LOGIN_USER CYPRESS_LOGIN_PWD NO_COLOR CEPH2_DASHBOARD_URL
 
 check_device_available
 
@@ -106,6 +126,7 @@ case "$DEVICE" in
             --env CYPRESS_BASE_URL \
             --env CYPRESS_LOGIN_USER \
             --env CYPRESS_LOGIN_PWD \
+            --env CEPH2_DASHBOARD_URL \
             --name=e2e \
             --network=host \
             cypress/included:${CYPRESS_VERSION} || failed=1