Skip to content

Commit 7360810

Browse files
strtgbbstrtgbb
committed
include altinity integration test changes
1 parent b78eada commit 7360810

File tree

42 files changed

+2685
-160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2685
-160
lines changed

‎tests/integration/helpers/cluster.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@
8585
# Minimum version we use in integration tests to check compatibility with old releases
8686
# Keep in mind that we only support upgrading between releases that are at most 1 year different.
8787
# This means that this minimum need to be, at least, 1 year older than the current release
88-
CLICKHOUSE_CI_MIN_TESTED_VERSION = "23.3"
88+
# NOTE(vnemkov): this is a docker tag, make sure it doesn't include initial 'v'
89+
CLICKHOUSE_CI_MIN_TESTED_VERSION = "23.3.19.33.altinitystable"
8990

9091
ZOOKEEPER_CONTAINERS = ("zoo1", "zoo2", "zoo3")
9192

‎tests/integration/test_backward_compatibility/test.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
node1 = cluster.add_instance(
77
"node1",
88
with_zookeeper=True,
9-
image="clickhouse/clickhouse-server",
9+
image="altinity/clickhouse-server",
1010
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
1111
stay_alive=True,
1212
with_installed_binary=True,

‎tests/integration/test_backward_compatibility/test_aggregate_fixed_key.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
node1 = cluster.add_instance(
77
"node1",
88
with_zookeeper=True,
9-
image="clickhouse/clickhouse-server",
9+
image="altinity/clickhouse-server",
1010
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
1111
with_installed_binary=True,
1212
)

‎tests/integration/test_backward_compatibility/test_aggregate_function_state.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
node1 = cluster.add_instance(
77
"node1",
88
with_zookeeper=False,
9-
image="clickhouse/clickhouse-server",
9+
image="altinity/clickhouse-server",
1010
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
1111
stay_alive=True,
1212
with_installed_binary=True,
1313
)
1414
node2 = cluster.add_instance(
1515
"node2",
1616
with_zookeeper=False,
17-
image="clickhouse/clickhouse-server",
17+
image="altinity/clickhouse-server",
1818
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
1919
stay_alive=True,
2020
with_installed_binary=True,

‎tests/integration/test_backward_compatibility/test_convert_ordinary.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
cluster = ClickHouseCluster(__file__)
66
node = cluster.add_instance(
77
"node",
8-
image="clickhouse/clickhouse-server",
8+
image="altinity/clickhouse-server",
99
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
1010
stay_alive=True,
1111
with_zookeeper=True,

‎tests/integration/test_backward_compatibility/test_cte_distributed.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
node2 = cluster.add_instance(
88
"node2",
99
with_zookeeper=False,
10-
image="clickhouse/clickhouse-server",
10+
image="altinity/clickhouse-server",
1111
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
1212
stay_alive=True,
1313
with_installed_binary=True,

‎tests/integration/test_backward_compatibility/test_functions.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
upstream = cluster.add_instance("upstream", use_old_analyzer=True)
1515
backward = cluster.add_instance(
1616
"backward",
17-
image="clickhouse/clickhouse-server",
17+
image="altinity/clickhouse-server",
1818
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
1919
with_installed_binary=True,
2020
)

‎tests/integration/test_backward_compatibility/test_insert_profile_events.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
upstream_node = cluster.add_instance("upstream_node", use_old_analyzer=True)
1111
old_node = cluster.add_instance(
1212
"old_node",
13-
image="clickhouse/clickhouse-server",
13+
image="altinity/clickhouse-server",
1414
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
1515
with_installed_binary=True,
1616
)

‎tests/integration/test_backward_compatibility/test_ip_types_binary_compatibility.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Version 21.6.3.14 has incompatible partition id for tables with UUID in partition key.
77
node = cluster.add_instance(
88
"node",
9-
image="clickhouse/clickhouse-server",
9+
image="altinity/clickhouse-server",
1010
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
1111
stay_alive=True,
1212
with_installed_binary=True,

‎tests/integration/test_backward_compatibility/test_memory_bound_aggregation.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
node1 = cluster.add_instance(
77
"node1",
88
with_zookeeper=False,
9-
image="clickhouse/clickhouse-server",
9+
image="altinity/clickhouse-server",
1010
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
1111
stay_alive=True,
1212
with_installed_binary=True,
1313
)
1414
node2 = cluster.add_instance(
1515
"node2",
1616
with_zookeeper=False,
17-
image="clickhouse/clickhouse-server",
17+
image="altinity/clickhouse-server",
1818
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
1919
stay_alive=True,
2020
with_installed_binary=True,

0 commit comments

Comments
 (0)