diff --git a/.github/workflows/e2e-compose.yaml b/.github/workflows/e2e-compose.yaml index ddea49a..61f3994 100644 --- a/.github/workflows/e2e-compose.yaml +++ b/.github/workflows/e2e-compose.yaml @@ -68,6 +68,10 @@ jobs: - name: Set up Go And Java uses: matrixorigin/CI/actions/setup-env@main + - name: Update BVT SQL Timeout + run: | + cd $GITHUB_WORKSPACE/mo-tester + sed -i "s/socketTimeout:.*/socketTimeout: 300000/g" mo.yml - name: Start BVT Test id: bvt_on_pr_version run: | @@ -157,6 +161,11 @@ jobs: - name: Set up Go And Java uses: matrixorigin/CI/actions/setup-env@main + - name: Update BVT SQL Timeout + run: | + cd $GITHUB_WORKSPACE/mo-tester + sed -i "s/socketTimeout:.*/socketTimeout: 300000/g" mo.yml + - name: Start BVT Test id: bvt_on_pr_version run: | diff --git a/.github/workflows/e2e-standalone.yaml b/.github/workflows/e2e-standalone.yaml index c21c3c6..86011ca 100644 --- a/.github/workflows/e2e-standalone.yaml +++ b/.github/workflows/e2e-standalone.yaml @@ -29,6 +29,8 @@ jobs: echo "" >> ./etc/launch/cn.toml echo '[cn.txn]' >> ./etc/launch/cn.toml echo 'mode = "Optimistic"' >> ./etc/launch/cn.toml + echo " enable-leak-check = 1" >> ./etc/launch/cn.toml + echo ' max-active-ages = "2m"'>> ./etc/launch/cn.toml echo "" >> ./etc/launch/tn.toml echo '[tn.txn]' >> ./etc/launch/tn.toml echo 'mode = "Optimistic"' >> ./etc/launch/tn.toml @@ -44,6 +46,10 @@ jobs: repository: matrixorigin/mo-tester path: ./mo-tester ref: main + - name: Update BVT SQL Timeout + run: | + cd $GITHUB_WORKSPACE/mo-tester + sed -i "s/socketTimeout:.*/socketTimeout: 300000/g" mo.yml - name: Start BVT Test id: bvt_on_pr_version run: | @@ -144,6 +150,14 @@ jobs: run: | sudo bash -c 'echo -e "127.0.0.1\tcn0" >> /etc/hosts;'; sudo bash -c 'echo -e "127.0.0.1\tcn1" >> /etc/hosts;'; + - name: Add cn.txn + run: | + cd $GITHUB_WORKSPACE/head + echo "" >> ./etc/launch-dynamic-with-proxy/cn.toml.base + echo "" >> ./etc/launch-dynamic-with-proxy/cn.toml.base + echo "[cn.txn]" >> ./etc/launch-dynamic-with-proxy/cn.toml.base + echo " enable-leak-check = 1" >> ./etc/launch-dynamic-with-proxy/cn.toml.base + echo ' max-active-ages = "2m"'>> ./etc/launch-dynamic-with-proxy/cn.toml.base - name: Start MO run: | sudo cat /etc/hosts | grep '127.0.0.1'; @@ -155,6 +169,10 @@ jobs: repository: matrixorigin/mo-tester path: ./mo-tester ref: main + - name: Update BVT SQL Timeout + run: | + cd $GITHUB_WORKSPACE/mo-tester + sed -i "s/socketTimeout:.*/socketTimeout: 300000/g" mo.yml - name: Start BVT Test id: bvt_on_pr_version run: | @@ -218,6 +236,13 @@ jobs: cd $GITHUB_WORKSPACE/head && make clean && make build git rev-parse --short HEAD + - name: Add cn.txn + run: | + cd $GITHUB_WORKSPACE/head + echo "[cn.txn]" >> ./etc/launch/cn.toml + echo " enable-leak-check = 1" >> ./etc/launch/cn.toml + echo ' max-active-ages = "2m"'>> ./etc/launch/cn.toml + - name: echo config run: | cd $GITHUB_WORKSPACE/head @@ -235,7 +260,10 @@ jobs: repository: matrixorigin/mo-tester path: ./mo-tester ref: main - + - name: Update BVT SQL Timeout + run: | + cd $GITHUB_WORKSPACE/mo-tester + sed -i "s/socketTimeout:.*/socketTimeout: 300000/g" mo.yml - name: Start BVT Test id: bvt_on_pr_version run: | diff --git a/.github/workflows/e2e-upgrade.yaml b/.github/workflows/e2e-upgrade.yaml index 927e560..486b094 100644 --- a/.github/workflows/e2e-upgrade.yaml +++ b/.github/workflows/e2e-upgrade.yaml @@ -36,11 +36,25 @@ jobs: - name: Set up Go And Java uses: matrixorigin/CI/actions/setup-env@main + - name: Add cn.txn for head + run: | + cd $GITHUB_WORKSPACE/head + echo "[cn.txn]" >> ./etc/launch/cn.toml + echo " enable-leak-check = 1" >> ./etc/launch/cn.toml + echo ' max-active-ages = "2m"'>> ./etc/launch/cn.toml + - name: Build MatrixOne for head run: | cd $GITHUB_WORKSPACE/head && make clean && make build git rev-parse --short HEAD + - name: Add cn.txn for upstream + run: | + cd $GITHUB_WORKSPACE/upstream + echo "[cn.txn]" >> ./etc/launch/cn.toml + echo " enable-leak-check = 1" >> ./etc/launch/cn.toml + echo ' max-active-ages = "2m"'>> ./etc/launch/cn.toml + - name: Build MatrixOne for upstream run: | cd $GITHUB_WORKSPACE/upstream && make clean && make build @@ -66,7 +80,10 @@ jobs: repository: matrixorigin/mo-tester path: ./mo-tester ref: main - + - name: Update BVT SQL Timeout + run: | + cd $GITHUB_WORKSPACE/mo-tester + sed -i "s/socketTimeout:.*/socketTimeout: 300000/g" mo.yml - name: Start BVT Test for Target Branch id: bvt_on_latest_main_version run: | @@ -118,7 +135,10 @@ jobs: fi ./optools/run_bvt.sh $GITHUB_WORKSPACE/workspace launch; sleep 60; - + - name: Update BVT SQL Timeout for Head Branch + run: | + cd $GITHUB_WORKSPACE/mo-tester + sed -i "s/socketTimeout:.*/socketTimeout: 300000/g" mo.yml - name: Start BVT Test for Head Branch id: bvt_on_latest_head_version run: | @@ -202,11 +222,25 @@ jobs: - name: Set up Go And Java uses: matrixorigin/CI/actions/setup-env@main + - name: Add cn.txn for head + run: | + cd $GITHUB_WORKSPACE/head + echo "[cn.txn]" >> ./etc/launch/cn.toml + echo " enable-leak-check = 1" >> ./etc/launch/cn.toml + echo ' max-active-ages = "2m"'>> ./etc/launch/cn.toml + - name: Build MatrixOne for head run: | cd $GITHUB_WORKSPACE/head && make clean && make build git rev-parse --short HEAD + - name: Add cn.txn for upstream release + run: | + cd $GITHUB_WORKSPACE/upstream + echo "[cn.txn]" >> ./etc/launch/cn.toml + echo " enable-leak-check = 1" >> ./etc/launch/cn.toml + echo ' max-active-ages = "2m"'>> ./etc/launch/cn.toml + - name: Build MatrixOne for upstream release run: | cd $GITHUB_WORKSPACE/upstream && make clean && make build @@ -232,7 +266,10 @@ jobs: repository: matrixorigin/mo-tester path: ./mo-tester ref: main - + - name: Update BVT SQL Timeout for Release ${{ inputs.release-version }} + run: | + cd $GITHUB_WORKSPACE/mo-tester + sed -i "s/socketTimeout:.*/socketTimeout: 300000/g" mo.yml - name: Start BVT Test for Release ${{ inputs.release-version }} id: bvt_on_latest_main_version run: | @@ -286,7 +323,10 @@ jobs: fi ./optools/run_bvt.sh $GITHUB_WORKSPACE/workspace launch; sleep 60; - + - name: Update BVT SQL Timeout for Head Ref + run: | + cd $GITHUB_WORKSPACE/mo-tester + sed -i "s/socketTimeout:.*/socketTimeout: 300000/g" mo.yml - name: Start BVT Test for Head Ref id: bvt_on_latest_head_version run: | diff --git a/.github/workflows/merge-trigger-standalone.yaml b/.github/workflows/merge-trigger-standalone.yaml index 21ca288..8787c63 100644 --- a/.github/workflows/merge-trigger-standalone.yaml +++ b/.github/workflows/merge-trigger-standalone.yaml @@ -26,6 +26,13 @@ jobs: setup-java: false cache: true + - name: Add cn.txn + run: | + cd $GITHUB_WORKSPACE/matrixone + echo "[cn.txn]" >> ./etc/launch/cn.toml + echo " enable-leak-check = 1" >> ./etc/launch/cn.toml + echo ' max-active-ages = "2m"'>> ./etc/launch/cn.toml + - name: Build MatrixOne run: | cd $GITHUB_WORKSPACE/matrixone && make clean && make build @@ -56,7 +63,10 @@ jobs: - name: Check Java Version run: java -version - + - name: Update BVT SQL Timeout + run: | + cd $GITHUB_WORKSPACE/mo-tester + sed -i "" "s/socketTimeout:.*/socketTimeout: 300000/g" mo.yml - name: Start BVT Test id: bvt_on_pr_version run: | @@ -124,6 +134,12 @@ jobs: uses: matrixorigin/CI/actions/setup-env@main with: setup-java: false + - name: Add cn.txn + run: | + cd $GITHUB_WORKSPACE/head + echo "[cn.txn]" >> ./etc/launch/cn.toml + echo " enable-leak-check = 1" >> ./etc/launch/cn.toml + echo ' max-active-ages = "2m"'>> ./etc/launch/cn.toml - name: Build MatrixOne run: | export GOPROXY='http://goproxy.goproxy.svc.cluster.local' @@ -141,14 +157,13 @@ jobs: ref: main - name: Set up JDK 8 for x64 run: echo "$JAVA_HOME/bin" >> $GITHUB_PATH - - name: Start BVT Test id: bvt_on_pr_version run: | export LC_ALL="C.UTF-8" locale cd $GITHUB_WORKSPACE/mo-tester - sed -i 's/socketTimeout:.*/socketTimeout: 600000/g' mo.yml + sed -i 's/socketTimeout:.*/socketTimeout: 300000/g' mo.yml sed -i 's/ port: [0-9]*/ port: 12345/g' mo.yml cat mo.yml echo "======================================" diff --git a/.github/workflows/robot.yaml b/.github/workflows/robot.yaml index 0b089c2..408ffe5 100644 --- a/.github/workflows/robot.yaml +++ b/.github/workflows/robot.yaml @@ -148,6 +148,12 @@ jobs: repository: matrixorigin/mo-tester path: ./mo-tester ref: main + - name: Add cn.txn + run: | + cd $GITHUB_WORKSPACE/matrixone + echo "[cn.txn]" >> ./etc/launch/cn.toml + echo " enable-leak-check = 1" >> ./etc/launch/cn.toml + echo ' max-active-ages = "2m"'>> ./etc/launch/cn.toml - name: Start Unit Test timeout-minutes: 120 run: | @@ -168,6 +174,10 @@ jobs: export GOCOVERDIR=$GITHUB_WORKSPACE/matrixone go build -cover "$GOLDFLAGS" -o mo-service ./cmd/mo-service/ ./optools/run_bvt.sh $GITHUB_WORKSPACE/matrixone launch + - name: Update BVT SQL Timeout + run: | + cd $GITHUB_WORKSPACE/mo-tester + sed -i "s/socketTimeout:.*/socketTimeout: 300000/g" mo.yml - name: Start BVT Test if: ${{ always() && !cancelled() }} id: bvt_on_pr_version diff --git a/.github/workflows/utils.yaml b/.github/workflows/utils.yaml index eefb7aa..7c5304c 100644 --- a/.github/workflows/utils.yaml +++ b/.github/workflows/utils.yaml @@ -131,6 +131,12 @@ jobs: repository: matrixorigin/mo-tester path: ./mo-tester ref: main + - name: Add cn.txn + run: | + cd $GITHUB_WORKSPACE/matrixone + echo "[cn.txn]" >> ./etc/launch/cn.toml + echo " enable-leak-check = 1" >> ./etc/launch/cn.toml + echo ' max-active-ages = "2m"'>> ./etc/launch/cn.toml - name: Start Unit Test timeout-minutes: 45 run: | @@ -151,6 +157,10 @@ jobs: export GOCOVERDIR=$GITHUB_WORKSPACE/matrixone go build -cover "$GOLDFLAGS" -o mo-service ./cmd/mo-service/ ./optools/run_bvt.sh $GITHUB_WORKSPACE/matrixone launch + - name: Update BVT SQL Timeout + run: | + cd $GITHUB_WORKSPACE/mo-tester + sed -i "s/socketTimeout:.*/socketTimeout: 300000/g" mo.yml - name: Start BVT Test timeout-minutes: 30 if: ${{ always() && !cancelled() }}