From b93a1a164ccc1c02b37726b390a7d5b09dc0b68e Mon Sep 17 00:00:00 2001 From: Rene Cannao Date: Sun, 22 Mar 2026 20:36:58 +0000 Subject: [PATCH] Remove jenkins-build-scripts dependencies from test scripts - Update proxysql-tester.yml: benchmark script path uses $WORKSPACE - Remove all JENKINS_SCRIPTS_PATH references from proxysql-tester.py - Use TAP env vars in local-docker-benchmark.bash for host/port/password Co-Authored-By: Claude Opus 4.6 (1M context) --- test/infra/infra-mysql57/bin/local-docker-benchmark.bash | 8 +++----- test/scripts/bin/proxysql-tester.py | 4 ++-- test/scripts/etc/proxysql-tester.yml | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/test/infra/infra-mysql57/bin/local-docker-benchmark.bash b/test/infra/infra-mysql57/bin/local-docker-benchmark.bash index 45b2f558d..e4e575d09 100755 --- a/test/infra/infra-mysql57/bin/local-docker-benchmark.bash +++ b/test/infra/infra-mysql57/bin/local-docker-benchmark.bash @@ -9,11 +9,9 @@ SIZE_TABLES=10 REPORT_INTERVAL=1 TIME=10 SCRIPT=oltp_read_write.lua -MYSQL_HOST=127.0.0.1 -#MYSQL_HOST=mysql1.infra-mysql57 -MYSQL_PORT=6033 -#MYSQL_PORT=3306 -MYSQL_PWD=root +MYSQL_HOST=${TAP_ROOTHOST:-127.0.0.1} +MYSQL_PORT=${TAP_ROOTPORT:-6033} +MYSQL_PWD=${TAP_ROOTPASSWORD:-root} printf "[$(date)] Dropping 'sysbench' schema if present and preparing test dataset:\n" mysql -h$MYSQL_HOST -P$MYSQL_PORT -uroot -p$MYSQL_PWD -e"DROP DATABASE IF EXISTS sysbench; CREATE DATABASE IF NOT EXISTS sysbench;" 2>&1 | grep -vP 'mysql: .?Warning' diff --git a/test/scripts/bin/proxysql-tester.py b/test/scripts/bin/proxysql-tester.py index 311e31f52..be4fcfe9f 100755 --- a/test/scripts/bin/proxysql-tester.py +++ b/test/scripts/bin/proxysql-tester.py @@ -806,7 +806,7 @@ CREATE TABLE stats_history.mysql_server_read_only_log ( if test_file in zero_sec_level_tap_tests: tap_env["OPENSSL_CONF"] = ( - os.environ["JENKINS_SCRIPTS_PATH"] + "/test-scripts/datadir/openssl_level_zero.cnf" + os.environ.get("WORKSPACE", ".") + "/test-scripts/datadir/openssl_level_zero.cnf" ) try: @@ -1551,7 +1551,7 @@ def start_proxysql(conn_args, timeout): subprocess.call( args="./test-scripts/proxysql_cluster_init.sh", shell=True, - cwd=os.environ["JENKINS_SCRIPTS_PATH"], + cwd=os.environ.get("WORKSPACE", "."), env=os.environ.copy() ) diff --git a/test/scripts/etc/proxysql-tester.yml b/test/scripts/etc/proxysql-tester.yml index 45ef575f1..bbde1ec6c 100644 --- a/test/scripts/etc/proxysql-tester.yml +++ b/test/scripts/etc/proxysql-tester.yml @@ -1,3 +1,3 @@ GLOBAL: OG_API_KEY: c4a8af4e-ac7c-4641-81b4-bd4935b46af4 - BENCHMARK_SCRIPT: $JENKINS_SCRIPTS_PATH/docker-mysql-proxysql/bin/local-docker-benchmark.bash + BENCHMARK_SCRIPT: $WORKSPACE/test/infra/infra-mysql57/bin/local-docker-benchmark.bash