-
Notifications
You must be signed in to change notification settings - Fork 986
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'v2.x' into v2.x_refactor_read_only_action_with_simulator
- Loading branch information
Showing
45 changed files
with
2,866 additions
and
480 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,201 @@ | ||
|
|
||
| name: CI-basictests | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ "v2.x" ] | ||
| paths-ignore: | ||
| - '.github/**' | ||
| - '**.md' | ||
| pull_request: | ||
| branches: [ "v2.x" ] | ||
| paths-ignore: | ||
| - '.github/**' | ||
| - '**.md' | ||
| # schedule: | ||
| # - cron: '15 13 * * 3' | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| build-n-test: | ||
| runs-on: ubuntu-22.04 | ||
| steps: | ||
|
|
||
| - name: Install dependencies | ||
| run: | | ||
| sudo apt-get update -y | ||
| sudo apt-get install -y python3-pymysql python3-structlog sysbench mycli | ||
| sudo pip3 install fastcov | ||
| wget https://github.com/openark/orchestrator/releases/download/v3.2.6/orchestrator-client_3.2.6_amd64.deb | ||
| sudo dpkg -i orchestrator-client_3.2.6_amd64.deb | ||
| sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 467B942D3A79BD29 | ||
| wget https://repo.mysql.com/mysql-apt-config_0.8.24-1_all.deb | ||
| sudo dpkg -i mysql-apt-config_0.8.24-1_all.deb | ||
| sudo apt-get update -y | ||
| sudo apt-cache policy mysql-shell | ||
| sudo apt-get install -y mysql-shell | ||
| sudo sed -i 's/8.0/5.7/' /etc/apt/sources.list.d/mysql.list | ||
| sudo sed -i 's/jammy/bionic/' /etc/apt/sources.list.d/mysql.list | ||
| sudo apt-get update -y | ||
| sudo apt-cache policy libmysqlclient-dev | ||
| sudo apt-get install -y --allow-downgrades libmysqlclient-dev=5.7* | ||
| - name: Checkout proxysql | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| repository: 'sysown/proxysql' | ||
| # ref: 'v2.x' | ||
| fetch-depth: 0 | ||
| path: 'proxysql' | ||
|
|
||
| - name: Set GIT_VERSION | ||
| run: | | ||
| cd proxysql/ | ||
| git fetch --tags --force | ||
| echo "GIT_VERSION=$(git describe --long --abbrev=7)" >> $GITHUB_ENV | ||
| - name: Fix paths | ||
| run: | | ||
| sudo ln -s ${{ github.workspace }}/proxysql /opt/proxysql | ||
| - name: Checkout jenkins_build_scripts | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| repository: 'proxysql/jenkins-build-scripts' | ||
| ref: 'kubernetes' | ||
| fetch-depth: 0 | ||
| path: 'jenkins-build-scripts' | ||
| token: ${{ secrets.GH_TOKEN }} | ||
| submodules: 'false' | ||
|
|
||
| - name: Configure env.sh | ||
| run: | | ||
| cd jenkins-build-scripts | ||
| #git rm --cached proxysql_qa_test_suite | ||
| # configure paths | ||
| sed -i "s|JENKINS_SCRIPTS_PATH=.*|JENKINS_SCRIPTS_PATH=${{ github.workspace }}/jenkins-build-scripts|" env.sh | ||
| sed -i "s|WORKSPACE=.*|WORKSPACE=${{ github.workspace }}/proxysql|" env.sh | ||
| # select tests | ||
| sed -i "s|TEST_PY_INTERNAL=.*|TEST_PY_INTERNAL=0|" env.sh | ||
| sed -i "s|TEST_PY_BENCHMARK=.*|TEST_PY_BENCHMARK=1|" env.sh | ||
| sed -i "s|TEST_PY_CHUSER=.*|TEST_PY_CHUSER=1|" env.sh | ||
| sed -i "s|TEST_PY_STATS=.*|TEST_PY_STATS=0|" env.sh | ||
| sed -i "s|TEST_PY_TAP=.*|TEST_PY_TAP=0|" env.sh | ||
| sed -i "s|TEST_PY_TAPINT=.*|TEST_PY_TAPINT=0|" env.sh | ||
| sed -i "s|TEST_PY_FAILOVER=.*|TEST_PY_FAILOVER=1|" env.sh | ||
| #sed -i "s/TEST_PY_TAP_INCL=.*/TEST_PY_TAP_INCL=\"${{ matrix.testgroup }}\"/" env.sh | ||
| #sed -i "s|TEST_PY_TAP_EXCL=.*|TEST_PY_TAP_EXCL=\"\"|" env.sh | ||
| - name: Patch TAP-tests | ||
| run: | | ||
| # apply patches | ||
| for PATCH in $(cd jenkins-build-scripts/test-scripts/patches; find . -type f); do | ||
| if [[ $PATCH =~ \.patch ]]; then | ||
| patch proxysql/test/tap/${PATCH%.patch} jenkins-build-scripts/test-scripts/patches/${PATCH} | ||
| elif [[ ! -f jenkins-build-scripts/test-scripts/patches/${PATCH#./}.patch ]]; then | ||
| cp jenkins-build-scripts/test-scripts/patches/${PATCH#./} proxysql/test/tap/${PATCH#./} | ||
| fi | ||
| done | ||
| - name: Build | ||
| run: | | ||
| cd proxysql/ | ||
| # fix compile issues | ||
| grep -rl "<curl/curl.h>" test/ | xargs sed -i 's|<curl/curl.h>|"curl/curl.h"|' | ||
| sed -i 's|-I/usr/include/mysql |-I/usr/include/mysql -I$(CURL_IDIR) |' test/tap/tests/Makefile | ||
| # build proxysql | ||
| sed -i "/command/c \ command: bash -l -c 'cd /opt/proxysql && make debug_clickhouse WITHGCOV=1'" docker-compose.yml | ||
| #cat docker-compose.yml | ||
| make ubuntu22-dbg | ||
| # build tap tests | ||
| sed -i "/command/c \ command: bash -l -c 'cd /opt/proxysql && make build_tap_test_debug WITHGCOV=1'" docker-compose.yml | ||
| #cat docker-compose.yml | ||
| #make ubuntu22-dbg | ||
| # remove irrelevant tests (failing) | ||
| cd test/tap/tests | ||
| rm -f *clickhouse*-t | ||
| #rm -f *cluster*-t | ||
| rm -f *binlog*-t | ||
| rm -f *mariadb*-t | ||
| rm -f reg_test_3992_fast_forward_malformed_packet*-t | ||
| #rm -f reg_test_3847_admin_lock-t | ||
| #rm -f set_testing-240-t | ||
| #rm -f test_com_reset_connection_com_change_user*-t | ||
| #rm -f max_connections_ff-t | ||
| #rm -f test_server_sess_status-t | ||
| # remove long running tests (passing) | ||
| #rm -f multiple_prepared_statements-t | ||
| #rm -f mysql-mirror1-t | ||
| - name: Run proxysql | ||
| run: | | ||
| set -x | ||
| set +e | ||
| cd ${{ github.workspace }}/jenkins-build-scripts | ||
| source ./env.sh | ||
| ./cluster_start.bash | ||
| sleep 10 | ||
| cd ${{ github.workspace }}/proxysql | ||
| mkdir -p ci_infra_logs/regular_infra/proxysql | ||
| cd src | ||
| mkdir coverage_reports | ||
| (./proxysql --clickhouse-server --sqlite3-server --idle-threads -f -c "$DOCKER_SCRIPT_PATH/conf/proxysql/proxysql.cnf" -D $REGULAR_INFRA_DATADIR &> $REGULAR_INFRA_DATADIR/proxysql.log) & | ||
| sleep 10 | ||
| mysql -uadmin -padmin -h127.0.0.1 -P6032 -e "SELECT version();" | ||
| cd ${{ github.workspace }}/jenkins-build-scripts | ||
| ./cluster_init.bash | ||
| sleep 10 | ||
| - name: Run infra | ||
| run: | | ||
| cd ${{ github.workspace }}/jenkins-build-scripts | ||
| source ./env.sh | ||
| cd ${{ github.workspace }}/jenkins-build-scripts/infra-docker-hoster | ||
| #docker-compose up -d | ||
| ./docker-compose-init.bash | ||
| cd ${{ github.workspace }}/jenkins-build-scripts/infra-mysql57 | ||
| sed -i "s/\${INFRA}-\${CONTAINER}-1/\${INFRA}_\${CONTAINER}_1/" docker-compose-init.bash | ||
| ./docker-compose-init.bash | ||
| - name: Basic tests | ||
| run: | | ||
| set +e | ||
| cd ${{ github.workspace }}/jenkins-build-scripts | ||
| source ./env.sh | ||
| env | sort | ||
| sudo -E ./test-scripts/bin/proxysql-tester.py | ||
| RC=$? | ||
| exit $RC | ||
| - name: Fix premissions | ||
| if: always() | ||
| run: | | ||
| sudo chmod -R 777 ${{ github.workspace }}/* | ||
| - name: Archive artifacts | ||
| if: always() | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: ci-selftests-${{ env.GIT_VERSION }}-run#${{ github.run_number }} | ||
| path: | | ||
| proxysql/ci_gcov_logs/ | ||
| proxysql/ci_infra_logs/ | ||
| proxysql/ci_tests_logs/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| name: CI-repltests | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ "v2.x" ] | ||
| paths-ignore: | ||
| - '.github/**' | ||
| - '**.md' | ||
| pull_request: | ||
| branches: [ "v2.x" ] | ||
| paths-ignore: | ||
| - '.github/**' | ||
| - '**.md' | ||
| # schedule: | ||
| # - cron: '15 13 * * 3' | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-22.04 | ||
| steps: | ||
|
|
||
| - name: Install dependencies | ||
| run: | | ||
| sudo apt-get update -y | ||
| sudo apt-get install -y sysbench gettext | ||
| - name: Checkout proxysql | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| repository: 'sysown/proxysql' | ||
| # ref: 'v2.x' | ||
| fetch-depth: 0 | ||
| path: 'proxysql' | ||
|
|
||
| - name: Checkout jenkins_build_scripts | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| repository: 'proxysql/jenkins-build-scripts' | ||
| ref: 'proxysql_repl_tests' | ||
| fetch-depth: 0 | ||
| path: 'jenkins-build-scripts' | ||
| token: ${{ secrets.GH_TOKEN }} | ||
|
|
||
| - name: Set GIT_VERSION | ||
| run: | | ||
| cd proxysql/ | ||
| git fetch --tags --force | ||
| echo "GIT_VERSION=$(git describe --long --abbrev=7)" >> $GITHUB_ENV | ||
| - name: Build | ||
| run: | | ||
| cd proxysql/ | ||
| make ubuntu22-dbg | ||
| - name: Docker-hoster | ||
| run: | | ||
| cd jenkins-build-scripts/infra-docker-hoster | ||
| docker-compose up -d | ||
| - name: Replication-tests | ||
| run: | | ||
| set +e | ||
| cd jenkins-build-scripts | ||
| sed -i "s|#!/usr/bin/bash|#!/usr/bin/bash +e|" proxysql_repl_tests/bin/debezium-check.bash | ||
| sed -i "s|#!/usr/bin/bash|#!/usr/bin/bash +e|" proxysql_repl_tests/exec_repl_test.sh | ||
| sed -i "s|JENKINS_SCRIPTS_PATH=.*|JENKINS_SCRIPTS_PATH=${{ github.workspace }}/jenkins-build-scripts|" env.sh | ||
| sed -i "s|WORKSPACE=.*|WORKSPACE=${{ github.workspace }}/proxysql|" env.sh | ||
| cd proxysql_repl_tests | ||
| #./exec_repl_test.sh 5.7 no-ssl debezium | ||
| ./exec_all_repl_tests.sh | ||
| RC=$? | ||
| #./docker-compose-destroy.bash | ||
| sudo chmod -R 777 ${{ github.workspace }}/* | ||
| exit $RC | ||
| - name: Archive artifacts | ||
| if: always() | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: ci-selftests-${{ env.GIT_VERSION }}-run#${{ github.run_number }} | ||
| path: | | ||
| proxysql/src/ | ||
| proxysql/ci_infra_logs/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| openssl-3.0.8 | ||
| openssl-3.1.0 |
Binary file renamed
BIN
+14.4 MB
deps/libssl/openssl-3.0.8.tar.gz → deps/libssl/openssl-3.1.0.tar.gz
Binary file not shown.
Oops, something went wrong.