From 88ad384506ead17b47086ff177b9a6319109abf5 Mon Sep 17 00:00:00 2001 From: Andrei Aaron Date: Sun, 16 Mar 2025 19:04:12 +0000 Subject: [PATCH] test: do not use the clustering feature in case of redis + s3 storage Signed-off-by: Andrei Aaron --- test/scale-out/cloud_scale_out_redis.bats | 2 -- test/scale-out/cloud_scale_out_redis_scale.bats | 2 -- test/scale-out/helpers_zot.bash | 4 ---- 3 files changed, 8 deletions(-) diff --git a/test/scale-out/cloud_scale_out_redis.bats b/test/scale-out/cloud_scale_out_redis.bats index 9b80d07d..d6ec15ae 100644 --- a/test/scale-out/cloud_scale_out_redis.bats +++ b/test/scale-out/cloud_scale_out_redis.bats @@ -32,7 +32,6 @@ function launch_zot_server() { local zot_log_file="${ZOT_LOG_DIR}/zot-${zot_server_address}-${zot_server_port}.log" create_zot_cloud_redis_config_file ${zot_server_address} ${zot_server_port} ${zot_root_dir} ${zot_config_file} ${zot_log_file} ${redis_url} - update_zot_cluster_member_list_in_config_file ${zot_config_file} ${ZOT_CLUSTER_MEMBERS_PATCH_FILE} echo "launching zot server ${zot_server_address}:${zot_server_port}" >&3 echo "config file: ${zot_config_file}" >&3 @@ -55,7 +54,6 @@ function setup() { # setup S3 bucket and DynamoDB tables setup_cloud_services - generate_zot_cluster_member_list ${NUM_ZOT_INSTANCES} ${ZOT_CLUSTER_MEMBERS_PATCH_FILE} for ((i=0;i<${NUM_ZOT_INSTANCES};i++)); do launch_zot_server 127.0.0.1 $(( 10000 + $i )) ${redis_url} diff --git a/test/scale-out/cloud_scale_out_redis_scale.bats b/test/scale-out/cloud_scale_out_redis_scale.bats index e52108ec..bec479ef 100644 --- a/test/scale-out/cloud_scale_out_redis_scale.bats +++ b/test/scale-out/cloud_scale_out_redis_scale.bats @@ -32,7 +32,6 @@ function launch_zot_server() { local zot_log_file="${ZOT_LOG_DIR}/zot-${zot_server_address}-${zot_server_port}.log" create_zot_cloud_redis_config_file ${zot_server_address} ${zot_server_port} ${zot_root_dir} ${zot_config_file} ${zot_log_file} ${redis_url} - update_zot_cluster_member_list_in_config_file ${zot_config_file} ${ZOT_CLUSTER_MEMBERS_PATCH_FILE} echo "launching zot server ${zot_server_address}:${zot_server_port}" >&3 echo "config file: ${zot_config_file}" >&3 @@ -55,7 +54,6 @@ function setup() { # setup S3 bucket and DynamoDB tables setup_cloud_services - generate_zot_cluster_member_list ${NUM_ZOT_INSTANCES} ${ZOT_CLUSTER_MEMBERS_PATCH_FILE} for ((i=0;i<${NUM_ZOT_INSTANCES};i++)); do launch_zot_server 127.0.0.1 $(( 10000 + $i )) ${redis_url} diff --git a/test/scale-out/helpers_zot.bash b/test/scale-out/helpers_zot.bash index 670012f9..c2535b19 100644 --- a/test/scale-out/helpers_zot.bash +++ b/test/scale-out/helpers_zot.bash @@ -272,10 +272,6 @@ function create_zot_cloud_redis_config_file() { "address": "${zot_server_address}", "port": "${zot_server_port}" }, - "cluster": { - "members": [], - "hashKey": "loremipsumdolors" - }, "log": { "level": "debug", "output": "${zot_log_file}"