Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add cn.txn and Update bvt sql timeout for CI #129

Merged
merged 10 commits into from
Oct 28, 2024
Merged

Add cn.txn and Update bvt sql timeout for CI #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e57e7f1
add cn.txn
Rosyrain Sep 11, 2024
cb85fa5
update BVT SQL timeout
Rosyrain Sep 11, 2024
681efff
update BVT SQL timeout
Rosyrain Sep 11, 2024
18a9fcb
Correction error
Rosyrain Sep 11, 2024
49fef1c
update
Rosyrain Oct 10, 2024
4c02e19
Merge branch 'main' into CI-mo-cn-bvt
Rosyrain Oct 10, 2024
fa884e4
Merge branch 'main' into CI-mo-cn-bvt
Rosyrain Oct 10, 2024
2acacb1
update runner
Rosyrain Oct 11, 2024
d007e4c
Merge remote-tracking branch 'origin/CI-mo-cn-bvt' into CI-mo-cn-bvt
Rosyrain Oct 11, 2024
ec28b53
update runner
Rosyrain Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/workflows/e2e-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down
30 changes: 29 additions & 1 deletion .github/workflows/e2e-standalone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand Down Expand Up @@ -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';
Expand All @@ -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: |
Expand Down Expand Up @@ -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
Expand All @@ -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: |
Expand Down
48 changes: 44 additions & 4 deletions .github/workflows/e2e-upgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand All @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down
21 changes: 18 additions & 3 deletions .github/workflows/merge-trigger-standalone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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'
Expand All @@ -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 "======================================"
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/robot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/utils.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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() }}
Expand Down