From: Nizamudeen A <nia@redhat.com>
Date: Wed, 3 Aug 2022 16:09:36 +0000 (+0530)
Subject: mgr/dashboard: add out_client dir to api and e2e checks
X-Git-Tag: v18.0.0~211^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3dc45e450e83358972a397d341b73c5c0f8f7421;p=ceph-ci.git

mgr/dashboard: add out_client dir to api and e2e checks

Signed-off-by: Nizamudeen A <nia@redhat.com>
---

diff --git a/src/pybind/mgr/dashboard/run-backend-api-tests.sh b/src/pybind/mgr/dashboard/run-backend-api-tests.sh
index f64bfd0f62e..bdd38cbe8c5 100755
--- a/src/pybind/mgr/dashboard/run-backend-api-tests.sh
+++ b/src/pybind/mgr/dashboard/run-backend-api-tests.sh
@@ -131,6 +131,7 @@ run_teuthology_tests() {
 
     export COVERAGE_ENABLED=true
     export COVERAGE_FILE=.coverage.mgr.dashboard
+    export CEPH_OUT_CLIENT_DIR=${LOCAL_BUILD_DIR}/out/client
     find . -iname "*${COVERAGE_FILE}*" -type f -delete
 
     python ../qa/tasks/vstart_runner.py --ignore-missing-binaries --no-verbose $OPTIONS $(echo $TEST_CASES) ||
diff --git a/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh b/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh
index 9cb4ae7ec7b..2c288358872 100755
--- a/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh
+++ b/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh
@@ -21,6 +21,7 @@ start_ceph() {
     cd $FULL_PATH_BUILD_DIR
 
     for cluster in ${CLUSTERS[@]}; do
+        export CEPH_OUT_CLIENT_DIR=${FULL_PATH_BUILD_DIR}/run/${cluster}/out/client
         MGR=2 RGW=1 ../src/mstart.sh $cluster -n -d
     done
 
diff --git a/src/vstart.sh b/src/vstart.sh
index db00880cb4f..cbebe2bb5df 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -43,7 +43,7 @@ if [ -n "$VSTART_DEST" ]; then
     CEPH_DEV_DIR=$VSTART_DEST/dev
     CEPH_OUT_DIR=$VSTART_DEST/out
     CEPH_ASOK_DIR=$VSTART_DEST/asok
-    CEPH_OUT_CLIENT_DIR=$CEPH_OUT_DIR/client
+    CEPH_OUT_CLIENT_DIR=${CEPH_OUT_CLIENT_DIR:-$CEPH_OUT_DIR}
 fi
 
 get_cmake_variable() {
@@ -132,6 +132,7 @@ fi
 [ -z "$CEPH_ASOK_DIR" ] && CEPH_ASOK_DIR="$CEPH_DIR/asok"
 [ -z "$CEPH_RGW_PORT" ] && CEPH_RGW_PORT=8000
 [ -z "$CEPH_CONF_PATH" ] && CEPH_CONF_PATH=$CEPH_DIR
+CEPH_OUT_CLIENT_DIR=${CEPH_OUT_CLIENT_DIR:-$CEPH_OUT_DIR}
 
 if [ $CEPH_NUM_OSD -gt 3 ]; then
     OSD_POOL_DEFAULT_SIZE=3