use same path mount point in e2e-compose and merge-run (#319)

* same path mount

* fix merge run mount point

Author: aptend

.github/workflows/e2e-compose.yaml

@@ -61,6 +61,11 @@ jobs:
           cat ./etc/launch-tae-compose/config/cn-1.toml
           cat ./etc/launch-tae-compose/config/tn.toml
 
+          # Update compose.yaml to mount test directory to $GITHUB_WORKSPACE/test instead of /test
+          # Replace container mount point from /test to $GITHUB_WORKSPACE/test
+          # Handle various docker-compose volume formats: /test, /test:options, /test followed by space
+          sed -i 's|:/test\b|:'"$GITHUB_WORKSPACE"'/test|g' ./etc/launch-tae-compose/compose.yaml
+
           mkdir -p ${{ github.workspace }}/docker-compose-log
           docker compose -f etc/launch-tae-compose/compose.yaml --profile launch-multi-cn up -d --build
 
@@ -120,7 +125,7 @@ jobs:
           cat mo.yml
           echo "============================="
 
-          ./run.sh -n -g -o -p /test/distributed/cases -e pessimistic_transaction 2>&1
+          ./run.sh -n -g -o -p $GITHUB_WORKSPACE/test/distributed/cases -e pessimistic_transaction 2>&1
 
       - name: Print Docker Info Before Container Shutdown
         if: ${{ always() }}
@@ -213,6 +218,12 @@ jobs:
           cat ./etc/launch-tae-compose/config/cn-0.toml
           cat ./etc/launch-tae-compose/config/cn-1.toml
           cat ./etc/launch-tae-compose/config/tn.toml
+
+          # Update compose.yaml to mount test directory to $GITHUB_WORKSPACE/test instead of /test
+          # Replace container mount point from /test to $GITHUB_WORKSPACE/test
+          # Handle various docker-compose volume formats: /test, /test:options, /test followed by space
+          sed -i 's|:/test\b|:'"$GITHUB_WORKSPACE"'/test|g' ./etc/launch-tae-compose/compose.yaml
+
           mkdir -p ${{ github.workspace }}/docker-compose-log
           docker compose -f etc/launch-tae-compose/compose.yaml --profile launch-multi-cn up -d --build
 
@@ -269,7 +280,7 @@ jobs:
           cat mo.yml
           echo "============================="
 
-          ./run.sh -n -g -o -p /test/distributed/cases -e optimistic 2>&1
+          ./run.sh -n -g -o -p $GITHUB_WORKSPACE/test/distributed/cases -e optimistic 2>&1
 
       - name: Print Docker Info Before Container Shutdown
         if: ${{ always() }}

.github/workflows/merge-trigger-tke.yaml

@@ -206,7 +206,7 @@ jobs:
       - name: Prepare Data in cn-0
         timeout-minutes: 5
         run: |
-          kubectl exec -it ${{ steps.get_mo_addr.outputs.cn_0 }} -n mo-checkin-regression-${{ github.event.pull_request.number }} -- bash -c '
+          kubectl exec -it ${{ steps.get_mo_addr.outputs.cn_0 }} -n mo-checkin-regression-${{ github.event.pull_request.number }} -- env GITHUB_WORKSPACE=$GITHUB_WORKSPACE bash -c '
           set -x;
           export https_proxy=http://proxy-service.proxy.svc.cluster.local:8001
           git config --global init.defaultBranch main
@@ -231,12 +231,17 @@ jobs:
           if [ $success == "no" ]; then
             exit 1;
           fi
+
+          # 创建对应的目录结构和符号链接，容器内外资源目录一致
+          mkdir -p $GITHUB_WORKSPACE/matrixone/test/distributed
+          ln -sf $path_matrixone/matrixone/test/distributed/resources $GITHUB_WORKSPACE/matrixone/test/distributed/resources
+
           exit 0;
           '
       - name: Prepare Data in cn-1
         timeout-minutes: 5
         run: |
-          kubectl exec -it ${{ steps.get_mo_addr.outputs.cn_1 }} -n mo-checkin-regression-${{ github.event.pull_request.number }} -- bash -c '
+          kubectl exec -it ${{ steps.get_mo_addr.outputs.cn_1 }} -n mo-checkin-regression-${{ github.event.pull_request.number }} -- env GITHUB_WORKSPACE=$GITHUB_WORKSPACE bash -c '
           set -x;
           export https_proxy=http://proxy-service.proxy.svc.cluster.local:8001
           git config --global init.defaultBranch main
@@ -261,6 +266,11 @@ jobs:
           if [ $success == "no" ]; then
             exit 1;
           fi
+
+          # 创建对应的目录结构和符号链接
+          mkdir -p $GITHUB_WORKSPACE/matrixone/test/distributed
+          ln -sf $path_matrixone/matrixone/test/distributed/resources $GITHUB_WORKSPACE/matrixone/test/distributed/resources
+
           exit 0;
           '
   bvt_test:
@@ -302,7 +312,7 @@ jobs:
           echo "=========================="
 
           cd $GITHUB_WORKSPACE/mo-tester
-          ./run.sh -n -g -o -p $GITHUB_WORKSPACE/matrixone/test/distributed/cases -s /matrixone/test/distributed/resources -e optimistic  2>&1
+          ./run.sh -n -g -o -p $GITHUB_WORKSPACE/matrixone/test/distributed/cases -e optimistic  2>&1
           rm -rf .git lib
       - name: Collect Upload files
         if: ${{ always() || cancelled() }}