From cf33249988481f646fc0c42dc79729ea8feb1c7d Mon Sep 17 00:00:00 2001 From: Max Kainov Date: Fri, 15 Nov 2024 15:59:27 +0100 Subject: [PATCH] add configs to fast test digest --- ci/jobs/functional_stateful_tests.py | 3 ++- tests/ci/ci_config.py | 2 ++ tests/config/install.sh | 3 ++- tests/docker_scripts/fasttest_runner.sh | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ci/jobs/functional_stateful_tests.py b/ci/jobs/functional_stateful_tests.py index 0faba4383ec..b5840fcd45d 100644 --- a/ci/jobs/functional_stateful_tests.py +++ b/ci/jobs/functional_stateful_tests.py @@ -97,7 +97,8 @@ def main(): f"ln -sf {ch_path}/clickhouse {ch_path}/clickhouse-local", f"rm -rf {Settings.TEMP_DIR}/etc/ && mkdir -p {Settings.TEMP_DIR}/etc/clickhouse-client {Settings.TEMP_DIR}/etc/clickhouse-server", f"cp programs/server/config.xml programs/server/users.xml {Settings.TEMP_DIR}/etc/clickhouse-server/", - f"./tests/config/install.sh {Settings.TEMP_DIR}/etc/clickhouse-server {Settings.TEMP_DIR}/etc/clickhouse-client --s3-storage", + # TODO: find a way to work with Azure secret so it's ok for local tests as well, for now keep azure disabled + f"./tests/config/install.sh {Settings.TEMP_DIR}/etc/clickhouse-server {Settings.TEMP_DIR}/etc/clickhouse-client --s3-storage --no-azure", # clickhouse benchmark segfaults with --config-path, so provide client config by its default location f"cp {Settings.TEMP_DIR}/etc/clickhouse-client/* /etc/clickhouse-client/", # update_path_ch_config, diff --git a/tests/ci/ci_config.py b/tests/ci/ci_config.py index 4bd240e241c..a170dfdd8d1 100644 --- a/tests/ci/ci_config.py +++ b/tests/ci/ci_config.py @@ -569,6 +569,8 @@ class CI: include_paths=[ "./tests/queries/0_stateless/", "./tests/docker_scripts/", + "./tests/config/", + "./tests/clickhouse-test", ], exclude_files=[".md"], docker=["clickhouse/fasttest"], diff --git a/tests/config/install.sh b/tests/config/install.sh index 2ecc13788f0..ba25f8bc425 100755 --- a/tests/config/install.sh +++ b/tests/config/install.sh @@ -13,6 +13,7 @@ if [ $# -ge 2 ]; then fi FAST_TEST=0 + NO_AZURE=0 while [[ "$#" -gt 0 ]]; do @@ -88,7 +89,7 @@ ln -sf $SRC_PATH/config.d/serverwide_trace_collector.xml $DEST_SERVER_PATH/confi ln -sf $SRC_PATH/config.d/rocksdb.xml $DEST_SERVER_PATH/config.d/ # Not supported with fasttest. -if [ "${DEST_SERVER_PATH}" = "/etc/clickhouse-server" ] || [ "$FAST_TEST" != "1" ]; then +if [ "$FAST_TEST" != "1" ]; then ln -sf "$SRC_PATH/config.d/legacy_geobase.xml" "$DEST_SERVER_PATH/config.d/" fi diff --git a/tests/docker_scripts/fasttest_runner.sh b/tests/docker_scripts/fasttest_runner.sh index 302e49ffc26..b8b72aaf866 100755 --- a/tests/docker_scripts/fasttest_runner.sh +++ b/tests/docker_scripts/fasttest_runner.sh @@ -250,7 +250,7 @@ function configure mkdir -p "$FASTTEST_DATA"{,/client-config} cp -a "$FASTTEST_SOURCE/programs/server/"{config,users}.xml "$FASTTEST_DATA" - "$FASTTEST_SOURCE/tests/config/install.sh" "$FASTTEST_DATA" "$FASTTEST_DATA/client-config" + "$FASTTEST_SOURCE/tests/config/install.sh" "$FASTTEST_DATA" "$FASTTEST_DATA/client-config" --fast-test cp -a "$FASTTEST_SOURCE/programs/server/config.d/log_to_console.xml" "$FASTTEST_DATA/config.d" # doesn't support SSL rm -f "$FASTTEST_DATA/config.d/secure_ports.xml"