Merge pull request #63879 from ClickHouse/backport/24.3/63836

Backport #63836 to 24.3: Fix `test_short_strings_aggregation` for arm
This commit is contained in:
robot-ch-test-poll2 2024-05-15 22:10:39 +04:00 committed by GitHub
commit 6d74970929
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,13 +1,14 @@
import pytest
from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION, is_arm
# For arm version see https://github.com/ClickHouse/ClickHouse/pull/59132
cluster = ClickHouseCluster(__file__)
node1 = cluster.add_instance(
"node1",
with_zookeeper=False,
image="clickhouse/clickhouse-server",
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
tag="24.1" if is_arm() else CLICKHOUSE_CI_MIN_TESTED_VERSION,
stay_alive=True,
with_installed_binary=True,
)
@ -15,7 +16,7 @@ node2 = cluster.add_instance(
"node2",
with_zookeeper=False,
image="clickhouse/clickhouse-server",
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
tag="24.1" if is_arm() else CLICKHOUSE_CI_MIN_TESTED_VERSION,
stay_alive=True,
with_installed_binary=True,
)