From 66d2353851fd6af3ad4dee20d74a319ac2be30ba Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Sun, 14 Jan 2024 05:17:01 +0100 Subject: [PATCH] Revert "Fix Docker" This reverts commit 6955574c4c15644f8e7467703afbef6dc9e2627e. --- docker/test/stateful/run.sh | 4 ++-- tests/ci/functional_test_check.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/test/stateful/run.sh b/docker/test/stateful/run.sh index 3bb55b6739f..06c8375da48 100755 --- a/docker/test/stateful/run.sh +++ b/docker/test/stateful/run.sh @@ -241,7 +241,7 @@ ENGINE = MergeTree PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) -SETTINGS disk = disk(type = cache, path = '/dev/shm/clickhouse/', max_size = '2G', +SETTINGS disk = disk(type = cache, path = '/dev/shm/clickhouse/', max_size = '16G', disk = disk(type = web, endpoint = 'https://clickhouse-datasets-web.s3.us-east-1.amazonaws.com/')); END @@ -434,7 +434,7 @@ ENGINE = CollapsingMergeTree(Sign) PARTITION BY toYYYYMM(StartDate) ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID) SAMPLE BY intHash32(UserID) -SETTINGS disk = disk(type = cache, path = '/dev/shm/clickhouse/', max_size = '2G', +SETTINGS disk = disk(type = cache, path = '/dev/shm/clickhouse/', max_size = '16G', disk = disk(type = web, endpoint = 'https://clickhouse-datasets-web.s3.us-east-1.amazonaws.com/')); END diff --git a/tests/ci/functional_test_check.py b/tests/ci/functional_test_check.py index 9a2aa241406..89fcb9ce350 100644 --- a/tests/ci/functional_test_check.py +++ b/tests/ci/functional_test_check.py @@ -118,7 +118,7 @@ def get_run_command( ) return ( - f"docker run --shm-size=2g --volume={builds_path}:/package_folder " + f"docker run --volume={builds_path}:/package_folder " f"{ci_logs_args}" f"--volume={repo_path}/tests:/usr/share/clickhouse-test " f"{volume_with_broken_test}"