From dbfa17aabf4878f6d7e00a8e13334725fc2f7b28 Mon Sep 17 00:00:00 2001 From: alesapin Date: Mon, 1 Nov 2021 13:32:56 +0300 Subject: [PATCH] Add correct S3 --- docker/test/stress/Dockerfile | 2 ++ docker/test/stress/run.sh | 2 +- tests/ci/stress_check.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/test/stress/Dockerfile b/docker/test/stress/Dockerfile index 3fe1b790d5a..e28d25c9485 100644 --- a/docker/test/stress/Dockerfile +++ b/docker/test/stress/Dockerfile @@ -26,4 +26,6 @@ COPY ./stress /stress COPY run.sh / ENV DATASETS="hits visits" +ENV S3_URL="https://clickhouse-datasets.s3.yandex.net" + CMD ["/bin/bash", "/run.sh"] diff --git a/docker/test/stress/run.sh b/docker/test/stress/run.sh index a4e2f797210..04845f2a4d1 100755 --- a/docker/test/stress/run.sh +++ b/docker/test/stress/run.sh @@ -112,7 +112,7 @@ configure start # shellcheck disable=SC2086 # No quotes because I want to split it into words. -/s3downloader --dataset-names $DATASETS +/s3downloader --url-prefix "$S3_URL" --dataset-names $DATASETS chmod 777 -R /var/lib/clickhouse clickhouse-client --query "ATTACH DATABASE IF NOT EXISTS datasets ENGINE = Ordinary" clickhouse-client --query "CREATE DATABASE IF NOT EXISTS test" diff --git a/tests/ci/stress_check.py b/tests/ci/stress_check.py index ebac2cd86aa..8fb099af132 100644 --- a/tests/ci/stress_check.py +++ b/tests/ci/stress_check.py @@ -100,7 +100,7 @@ def build_config_to_string(build_config): def get_run_command(build_path, result_folder, server_log_folder, image): - cmd = "docker run " + \ + cmd = "docker run -e S3_URL='https://clickhouse-datasets.s3.amazonaws.com' " + \ f"--volume={build_path}:/package_folder " \ f"--volume={result_folder}:/test_output " \ f"--volume={server_log_folder}:/var/log/clickhouse-server {image}"