mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-22 15:42:02 +00:00
Fix integration tests
This commit is contained in:
parent
6a00296c2f
commit
411c535ac9
@ -10,7 +10,6 @@ node1 = cluster.add_instance(
|
|||||||
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
||||||
stay_alive=True,
|
stay_alive=True,
|
||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
node2 = cluster.add_instance(
|
node2 = cluster.add_instance(
|
||||||
"node2",
|
"node2",
|
||||||
|
@ -9,7 +9,6 @@ node1 = cluster.add_instance(
|
|||||||
image="clickhouse/clickhouse-server",
|
image="clickhouse/clickhouse-server",
|
||||||
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
node2 = cluster.add_instance("node2", with_zookeeper=True, use_old_analyzer=True)
|
node2 = cluster.add_instance("node2", with_zookeeper=True, use_old_analyzer=True)
|
||||||
node3 = cluster.add_instance("node3", with_zookeeper=True, use_old_analyzer=True)
|
node3 = cluster.add_instance("node3", with_zookeeper=True, use_old_analyzer=True)
|
||||||
|
@ -10,7 +10,6 @@ node1 = cluster.add_instance(
|
|||||||
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
||||||
stay_alive=True,
|
stay_alive=True,
|
||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
node2 = cluster.add_instance(
|
node2 = cluster.add_instance(
|
||||||
"node2",
|
"node2",
|
||||||
@ -19,7 +18,6 @@ node2 = cluster.add_instance(
|
|||||||
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
||||||
stay_alive=True,
|
stay_alive=True,
|
||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
node3 = cluster.add_instance("node3", with_zookeeper=False, use_old_analyzer=True)
|
node3 = cluster.add_instance("node3", with_zookeeper=False, use_old_analyzer=True)
|
||||||
node4 = cluster.add_instance("node4", with_zookeeper=False, use_old_analyzer=True)
|
node4 = cluster.add_instance("node4", with_zookeeper=False, use_old_analyzer=True)
|
||||||
|
@ -9,7 +9,6 @@ node = cluster.add_instance(
|
|||||||
stay_alive=True,
|
stay_alive=True,
|
||||||
with_zookeeper=True,
|
with_zookeeper=True,
|
||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -11,7 +11,6 @@ node2 = cluster.add_instance(
|
|||||||
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
||||||
stay_alive=True,
|
stay_alive=True,
|
||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -15,7 +15,6 @@ backward = cluster.add_instance(
|
|||||||
image="clickhouse/clickhouse-server",
|
image="clickhouse/clickhouse-server",
|
||||||
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -13,7 +13,6 @@ old_node = cluster.add_instance(
|
|||||||
image="clickhouse/clickhouse-server",
|
image="clickhouse/clickhouse-server",
|
||||||
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -10,7 +10,6 @@ node = cluster.add_instance(
|
|||||||
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
||||||
stay_alive=True,
|
stay_alive=True,
|
||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -10,7 +10,6 @@ node1 = cluster.add_instance(
|
|||||||
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
||||||
stay_alive=True,
|
stay_alive=True,
|
||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
node2 = cluster.add_instance(
|
node2 = cluster.add_instance(
|
||||||
"node2",
|
"node2",
|
||||||
@ -19,7 +18,6 @@ node2 = cluster.add_instance(
|
|||||||
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
||||||
stay_alive=True,
|
stay_alive=True,
|
||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
node3 = cluster.add_instance("node3", with_zookeeper=False, use_old_analyzer=True)
|
node3 = cluster.add_instance("node3", with_zookeeper=False, use_old_analyzer=True)
|
||||||
|
|
||||||
|
@ -11,7 +11,6 @@ node2 = cluster.add_instance(
|
|||||||
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
||||||
stay_alive=True,
|
stay_alive=True,
|
||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -11,7 +11,6 @@ node2 = cluster.add_instance(
|
|||||||
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
||||||
stay_alive=True,
|
stay_alive=True,
|
||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -10,7 +10,6 @@ node1 = cluster.add_instance(
|
|||||||
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
||||||
stay_alive=True,
|
stay_alive=True,
|
||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
node2 = cluster.add_instance(
|
node2 = cluster.add_instance(
|
||||||
"node2",
|
"node2",
|
||||||
@ -19,7 +18,6 @@ node2 = cluster.add_instance(
|
|||||||
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
||||||
stay_alive=True,
|
stay_alive=True,
|
||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
node3 = cluster.add_instance("node3", with_zookeeper=False, use_old_analyzer=True)
|
node3 = cluster.add_instance("node3", with_zookeeper=False, use_old_analyzer=True)
|
||||||
|
|
||||||
|
@ -11,7 +11,6 @@ node_old = cluster.add_instance(
|
|||||||
stay_alive=True,
|
stay_alive=True,
|
||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
with_zookeeper=True,
|
with_zookeeper=True,
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
node_new = cluster.add_instance(
|
node_new = cluster.add_instance(
|
||||||
"node2",
|
"node2",
|
||||||
|
@ -39,7 +39,6 @@ def cluster():
|
|||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
image="clickhouse/clickhouse-server",
|
image="clickhouse/clickhouse-server",
|
||||||
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
cluster.start()
|
cluster.start()
|
||||||
|
@ -14,7 +14,6 @@ node_dist = cluster.add_instance(
|
|||||||
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
||||||
stay_alive=True,
|
stay_alive=True,
|
||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -10,7 +10,6 @@ node_oldest = cluster.add_instance(
|
|||||||
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
main_configs=["configs/config.d/test_cluster.xml"],
|
main_configs=["configs/config.d/test_cluster.xml"],
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
old_nodes = [node_oldest]
|
old_nodes = [node_oldest]
|
||||||
new_node = cluster.add_instance("node_new")
|
new_node = cluster.add_instance("node_new")
|
||||||
|
@ -369,7 +369,6 @@ node7 = cluster.add_instance(
|
|||||||
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
||||||
stay_alive=True,
|
stay_alive=True,
|
||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
node8 = cluster.add_instance(
|
node8 = cluster.add_instance(
|
||||||
"node8",
|
"node8",
|
||||||
|
@ -9,7 +9,6 @@ node1 = cluster.add_instance(
|
|||||||
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
||||||
stay_alive=True,
|
stay_alive=True,
|
||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
node2 = cluster.add_instance(
|
node2 = cluster.add_instance(
|
||||||
"node2",
|
"node2",
|
||||||
@ -18,7 +17,6 @@ node2 = cluster.add_instance(
|
|||||||
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
||||||
stay_alive=True,
|
stay_alive=True,
|
||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -23,7 +23,6 @@ node4 = cluster.add_instance(
|
|||||||
main_configs=[
|
main_configs=[
|
||||||
"configs/compat.xml",
|
"configs/compat.xml",
|
||||||
],
|
],
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
node5 = cluster.add_instance(
|
node5 = cluster.add_instance(
|
||||||
@ -36,7 +35,6 @@ node5 = cluster.add_instance(
|
|||||||
main_configs=[
|
main_configs=[
|
||||||
"configs/compat.xml",
|
"configs/compat.xml",
|
||||||
],
|
],
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
node6 = cluster.add_instance(
|
node6 = cluster.add_instance(
|
||||||
"node6",
|
"node6",
|
||||||
@ -48,7 +46,6 @@ node6 = cluster.add_instance(
|
|||||||
main_configs=[
|
main_configs=[
|
||||||
"configs/compat.xml",
|
"configs/compat.xml",
|
||||||
],
|
],
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -14,7 +14,6 @@ node2 = cluster.add_instance(
|
|||||||
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
|
||||||
with_installed_binary=True,
|
with_installed_binary=True,
|
||||||
stay_alive=True,
|
stay_alive=True,
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -16,7 +16,6 @@ node1 = cluster.add_instance(
|
|||||||
main_configs=[
|
main_configs=[
|
||||||
"configs/compat.xml",
|
"configs/compat.xml",
|
||||||
],
|
],
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
node2 = cluster.add_instance(
|
node2 = cluster.add_instance(
|
||||||
"node2",
|
"node2",
|
||||||
@ -28,7 +27,6 @@ node2 = cluster.add_instance(
|
|||||||
main_configs=[
|
main_configs=[
|
||||||
"configs/compat.xml",
|
"configs/compat.xml",
|
||||||
],
|
],
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
node3 = cluster.add_instance(
|
node3 = cluster.add_instance(
|
||||||
"node3",
|
"node3",
|
||||||
@ -40,7 +38,6 @@ node3 = cluster.add_instance(
|
|||||||
main_configs=[
|
main_configs=[
|
||||||
"configs/compat.xml",
|
"configs/compat.xml",
|
||||||
],
|
],
|
||||||
use_old_analyzer=True,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user