Try reducing number of different images

tests/integration/test_backward_compatibility/test.py

@@ -7,7 +7,7 @@ node1 = cluster.add_instance(
     "node1",
     with_zookeeper=True,
     image="yandex/clickhouse-server",
-    tag="19.17.8.54",
+    tag="19.16.9.37",
     stay_alive=True,
     with_installed_binary=True,
     allow_analyzer=False,

tests/integration/test_backward_compatibility/test_aggregate_fixed_key.py

@@ -7,7 +7,7 @@ node1 = cluster.add_instance(
     "node1",
     with_zookeeper=True,
     image="yandex/clickhouse-server",
-    tag="21.3",
+    tag="20.8.11.17",
     with_installed_binary=True,
     allow_analyzer=False,
 )

tests/integration/test_backward_compatibility/test_convert_ordinary.py

@@ -5,7 +5,7 @@ cluster = ClickHouseCluster(__file__)
 node = cluster.add_instance(
     "node",
     image="yandex/clickhouse-server",
-    tag="19.17.8.54",
+    tag="19.16.9.37",
     stay_alive=True,
     with_zookeeper=True,
     with_installed_binary=True,

tests/integration/test_backward_compatibility/test_cte_distributed.py

@@ -8,7 +8,7 @@ node2 = cluster.add_instance(
     "node2",
     with_zookeeper=False,
     image="yandex/clickhouse-server",
-    tag="21.7.3.14",
+    tag="21.6",
     stay_alive=True,
     with_installed_binary=True,
     allow_analyzer=False,

tests/integration/test_backward_compatibility/test_insert_profile_events.py

@@ -11,7 +11,7 @@ upstream_node = cluster.add_instance("upstream_node", allow_analyzer=False)
 old_node = cluster.add_instance(
     "old_node",
     image="clickhouse/clickhouse-server",
-    tag="22.5.1.2079",
+    tag="22.6",
     with_installed_binary=True,
     allow_analyzer=False,
 )

tests/integration/test_backward_compatibility/test_memory_bound_aggregation.py

@@ -7,7 +7,7 @@ node1 = cluster.add_instance(
     "node1",
     with_zookeeper=False,
     image="yandex/clickhouse-server",
-    tag="21.1",
+    tag="20.8.11.17",
     stay_alive=True,
     with_installed_binary=True,
     allow_analyzer=False,
@@ -16,7 +16,7 @@ node2 = cluster.add_instance(
     "node2",
     with_zookeeper=False,
     image="yandex/clickhouse-server",
-    tag="21.1",
+    tag="20.8.11.17",
     stay_alive=True,
     with_installed_binary=True,
     allow_analyzer=False,

tests/integration/test_backward_compatibility/test_normalized_count_comparison.py

@@ -8,7 +8,7 @@ node2 = cluster.add_instance(
     "node2",
     with_zookeeper=False,
     image="yandex/clickhouse-server",
-    tag="21.7.2.7",
+    tag="21.6",
     stay_alive=True,
     with_installed_binary=True,
     allow_analyzer=False,

tests/integration/test_backward_compatibility/test_select_aggregate_alias_column.py

@@ -8,7 +8,7 @@ node2 = cluster.add_instance(
     "node2",
     with_zookeeper=False,
     image="yandex/clickhouse-server",
-    tag="21.7.2.7",
+    tag="21.6",
     stay_alive=True,
     with_installed_binary=True,
     allow_analyzer=False,

tests/integration/test_backward_compatibility/test_vertical_merges_from_compact_parts.py

@@ -7,7 +7,7 @@ cluster = ClickHouseCluster(__file__)
 node_old = cluster.add_instance(
     "node1",
     image="clickhouse/clickhouse-server",
-    tag="22.8",
+    tag="22.6",
     stay_alive=True,
     with_installed_binary=True,
     with_zookeeper=True,

tests/integration/test_default_compression_codec/test.py

@@ -29,7 +29,7 @@ node3 = cluster.add_instance(
     "node3",
     main_configs=["configs/default_compression.xml", "configs/wide_parts_only.xml"],
     image="yandex/clickhouse-server",
-    tag="20.3.16",
+    tag="19.16.9.37",
     stay_alive=True,
     with_installed_binary=True,
     allow_analyzer=False,

tests/integration/test_disk_over_web_server/test.py

@@ -38,7 +38,7 @@ def cluster():
             stay_alive=True,
             with_installed_binary=True,
             image="clickhouse/clickhouse-server",
-            tag="22.8.14.53",
+            tag="22.6",
             allow_analyzer=False,
         )
 

tests/integration/test_distributed_backward_compatability/test.py

@@ -8,7 +8,7 @@ node_old = cluster.add_instance(
     "node1",
     main_configs=["configs/remote_servers.xml"],
     image="yandex/clickhouse-server",
-    tag="20.8.9.6",
+    tag="20.8.11.17",
     stay_alive=True,
     with_installed_binary=True,
     allow_analyzer=False,

tests/integration/test_distributed_insert_backward_compatibility/test.py

@@ -11,7 +11,7 @@ node_dist = cluster.add_instance(
     "node2",
     main_configs=["configs/remote_servers.xml"],
     image="yandex/clickhouse-server",
-    tag="21.11.9.1",
+    tag="21.6",
     stay_alive=True,
     with_installed_binary=True,
     allow_analyzer=False,

tests/integration/test_distributed_inter_server_secret/test.py

@@ -31,7 +31,7 @@ backward = make_instance(
     "configs/remote_servers_backward.xml",
     image="clickhouse/clickhouse-server",
     # version without DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET_V2
-    tag="23.2.3",
+    tag="22.6",
     with_installed_binary=True,
     allow_analyzer=False,
 )

tests/integration/test_groupBitmapAnd_on_distributed/test.py

@@ -26,7 +26,7 @@ node4 = cluster.add_instance(
     "node4",
     main_configs=["configs/clusters.xml"],
     image="yandex/clickhouse-server",
-    tag="21.5",
+    tag="21.6",
     with_zookeeper=True,
     allow_analyzer=False,
 )

tests/integration/test_old_versions/test.py

@@ -55,7 +55,7 @@ node19_13 = cluster.add_instance(
 node19_16 = cluster.add_instance(
     "node19_16",
     image="yandex/clickhouse-server",
-    tag="19.16.2.2",
+    tag="19.16.9.37",
     with_installed_binary=True,
     main_configs=["configs/config.d/test_cluster.xml"],
     allow_analyzer=False,

tests/integration/test_polymorphic_parts/test.py

@@ -360,7 +360,7 @@ node7 = cluster.add_instance(
     user_configs=["configs_old/users.d/not_optimize_count.xml"],
     with_zookeeper=True,
     image="yandex/clickhouse-server",
-    tag="19.17.8.54",
+    tag="20.8.11.17",
     stay_alive=True,
     with_installed_binary=True,
     allow_analyzer=False,

tests/integration/test_replicated_merge_tree_compatibility/test.py

@@ -6,7 +6,7 @@ node1 = cluster.add_instance(
     "node1",
     with_zookeeper=True,
     image="yandex/clickhouse-server",
-    tag="20.12.4.5",
+    tag="20.8.11.17",
     stay_alive=True,
     with_installed_binary=True,
     allow_analyzer=False,
@@ -15,7 +15,7 @@ node2 = cluster.add_instance(
     "node2",
     with_zookeeper=True,
     image="yandex/clickhouse-server",
-    tag="20.12.4.5",
+    tag="20.8.11.17",
     stay_alive=True,
     with_installed_binary=True,
     allow_analyzer=False,

tests/integration/test_replicating_constants/test.py

@@ -9,7 +9,7 @@ node2 = cluster.add_instance(
     "node2",
     with_zookeeper=True,
     image="yandex/clickhouse-server",
-    tag="19.1.14",
+    tag="19.16.9.37",
     with_installed_binary=True,
     allow_analyzer=False,
 )

tests/integration/test_ttl_replicated/test.py

@@ -17,7 +17,7 @@ node4 = cluster.add_instance(
     "node4",
     with_zookeeper=True,
     image="yandex/clickhouse-server",
-    tag="20.12.4.5",
+    tag="20.8.11.17",
     stay_alive=True,
     with_installed_binary=True,
     main_configs=[
@@ -30,7 +30,7 @@ node5 = cluster.add_instance(
     "node5",
     with_zookeeper=True,
     image="yandex/clickhouse-server",
-    tag="20.12.4.5",
+    tag="20.8.11.17",
     stay_alive=True,
     with_installed_binary=True,
     main_configs=[
@@ -42,7 +42,7 @@ node6 = cluster.add_instance(
     "node6",
     with_zookeeper=True,
     image="yandex/clickhouse-server",
-    tag="20.12.4.5",
+    tag="20.8.11.17",
     stay_alive=True,
     with_installed_binary=True,
     main_configs=[

tests/integration/test_version_update/test.py

@@ -12,18 +12,18 @@ node2 = cluster.add_instance(
     "node2",
     with_zookeeper=True,
     image="yandex/clickhouse-server",
-    tag="21.2",
+    tag="20.8.11.17",
     with_installed_binary=True,
     stay_alive=True,
     allow_analyzer=False,
 )
 
-# Use differents nodes because if there is node.restart_from_latest_version(), then in later tests
+# Use different nodes because if there is node.restart_from_latest_version(), then in later tests
 # it will be with latest version, but shouldn't, order of tests in CI is shuffled.
 node3 = cluster.add_instance(
     "node3",
     image="yandex/clickhouse-server",
-    tag="21.5",
+    tag="21.6",
     with_installed_binary=True,
     stay_alive=True,
     allow_analyzer=False,
@@ -31,7 +31,7 @@ node3 = cluster.add_instance(
 node4 = cluster.add_instance(
     "node4",
     image="yandex/clickhouse-server",
-    tag="21.5",
+    tag="21.6",
     with_installed_binary=True,
     stay_alive=True,
     allow_analyzer=False,
@@ -39,7 +39,7 @@ node4 = cluster.add_instance(
 node5 = cluster.add_instance(
     "node5",
     image="yandex/clickhouse-server",
-    tag="21.5",
+    tag="21.6",
     with_installed_binary=True,
     stay_alive=True,
     allow_analyzer=False,
@@ -47,7 +47,7 @@ node5 = cluster.add_instance(
 node6 = cluster.add_instance(
     "node6",
     image="yandex/clickhouse-server",
-    tag="21.5",
+    tag="21.6",
     with_installed_binary=True,
     stay_alive=True,
     allow_analyzer=False,

tests/integration/test_version_update_after_mutation/test.py

@@ -10,7 +10,7 @@ node1 = cluster.add_instance(
     "node1",
     with_zookeeper=True,
     image="yandex/clickhouse-server",
-    tag="20.4.9.110",
+    tag="20.8.11.17",
     with_installed_binary=True,
     stay_alive=True,
     main_configs=[
@@ -22,7 +22,7 @@ node2 = cluster.add_instance(
     "node2",
     with_zookeeper=True,
     image="yandex/clickhouse-server",
-    tag="20.4.9.110",
+    tag="20.8.11.17",
     with_installed_binary=True,
     stay_alive=True,
     main_configs=[
@@ -34,7 +34,7 @@ node3 = cluster.add_instance(
     "node3",
     with_zookeeper=True,
     image="yandex/clickhouse-server",
-    tag="20.4.9.110",
+    tag="20.8.11.17",
     with_installed_binary=True,
     stay_alive=True,
     main_configs=[