From 3a16ff20562e4a74060bce08955a406b75dbb4cc Mon Sep 17 00:00:00 2001 From: dylan Date: Tue, 3 Dec 2024 15:03:06 -0800 Subject: [PATCH] template cluster id in tests --- docker/multi-node/docker-compose.yml | 16 ++++++++++++---- e2e_multi_node_LB_test.go | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/docker/multi-node/docker-compose.yml b/docker/multi-node/docker-compose.yml index 10edfed..a3d3de8 100644 --- a/docker/multi-node/docker-compose.yml +++ b/docker/multi-node/docker-compose.yml @@ -5,7 +5,9 @@ services: # - "3000:3000" volumes: - ./config/aerospike.conf:/opt/aerospike/etc/aerospike/aerospike.conf - - ./config/features.conf:/opt/aerospike/etc/aerospike/features.conf + - type: bind + source: ./config/features.conf + target: /opt/aerospike/etc/aerospike/features.conf command: - "--config-file" - "/opt/aerospike/etc/aerospike/aerospike.conf" @@ -25,7 +27,9 @@ services: - "10000:10000" volumes: - ./config/aerospike-vector-search-1.yml:/etc/aerospike-vector-search/aerospike-vector-search.yml - - ./config/features.conf:/etc/aerospike-vector-search/features.conf + - type: bind + source: ./config/features.conf + target: /etc/aerospike-vector-search/features.conf healthcheck: test: ["CMD", "curl", "-f", "http://avs-1:5040/manage/rest/v1"] interval: 5s @@ -42,7 +46,9 @@ services: - "10001:10001" volumes: - ./config/aerospike-vector-search-2.yml:/etc/aerospike-vector-search/aerospike-vector-search.yml - - ./config/features.conf:/etc/aerospike-vector-search/features.conf + - type: bind + source: ./config/features.conf + target: /etc/aerospike-vector-search/features.conf healthcheck: test: ["CMD", "curl", "-f", "http://avs-2:5040/manage/rest/v1"] interval: 5s @@ -59,7 +65,9 @@ services: - "10002:10002" volumes: - ./config/aerospike-vector-search-3.yml:/etc/aerospike-vector-search/aerospike-vector-search.yml - - ./config/features.conf:/etc/aerospike-vector-search/features.conf + - type: bind + source: ./config/features.conf + target: /etc/aerospike-vector-search/features.conf healthcheck: test: ["CMD", "curl", "-f", "http://avs-3:5040/manage/rest/v1"] interval: 5s diff --git a/e2e_multi_node_LB_test.go b/e2e_multi_node_LB_test.go index ca86007..e306dd1 100644 --- a/e2e_multi_node_LB_test.go +++ b/e2e_multi_node_LB_test.go @@ -61,7 +61,7 @@ func (suite *MultiNodeLBCmdTestSuite) TestNodeListCmd() { true, `Nodes ,Node,Roles,Endpoint,Cluster ID,Version,Visible Nodes -1,Seed,[INDEX_QUERY INDEX_UPDATE],127.0.0.1:10000,7975277036330396396,1.0.0,"{ +1,Seed,[INDEX_QUERY INDEX_UPDATE],localhost:10000,,,"{ 1103823447824: [1.1.1.1:10000] 2207646885648: [2.2.2.2:10000] 3311470323472: [3.3.3.3:10000] @@ -80,7 +80,7 @@ Possible scenarios: false, `Nodes ,Node,Roles,Endpoint,Cluster ID,Version,Visible Nodes -1,LB,N/A,127.0.0.1:10000,7975277036330396396,1.0.0,"{ +1,LB,N/A,localhost:10000,,,"{ 1103823447824: [1.1.1.1:10000] 2207646885648: [2.2.2.2:10000] 3311470323472: [3.3.3.3:10000]