Skip to content

Commit

Permalink
Set default for MULTI_NODE to avoid unbound variable error (#6216)
Browse files Browse the repository at this point in the history
  • Loading branch information
bbrks authored Apr 27, 2023
1 parent a8f3b6a commit 03e32ab
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions integration-test/start_server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ docker stop ${SG_TEST_COUCHBASE_SERVER_DOCKER_NAME} || true
docker rm ${SG_TEST_COUCHBASE_SERVER_DOCKER_NAME} || true
# --volume: Makes and mounts a CBS folder for storing a CBCollect if needed

if [ "${MULTI_NODE}" == "true" ]; then
if [ "${MULTI_NODE:-}" == "true" ]; then
${DOCKER_COMPOSE} up -d --force-recreate --renew-anon-volumes --remove-orphans
else
# single node
Expand All @@ -74,7 +74,7 @@ docker exec couchbase couchbase-cli setting-index --cluster couchbase://localhos
curl -u Administrator:password -v -X POST http://127.0.0.1:8091/node/controller/rename -d 'hostname=127.0.0.1'


if [ "${MULTI_NODE}" == "true" ]; then
if [ "${MULTI_NODE:-}" == "true" ]; then
REPLICA1_NAME=couchbase-replica1
REPLICA2_NAME=couchbase-replica2
CLI_ARGS=(-c couchbase://couchbase -u Administrator -p password)
Expand Down
2 changes: 1 addition & 1 deletion jenkins-integration-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ if [ "${RUN_WALRUS}" == "true" ]; then
fi

# Run CBS
if [ "${MULTI_NODE}" == "true" ]; then
if [ "${MULTI_NODE:-}" == "true" ]; then
# multi node
./integration-test/start_server.sh -m "${COUCHBASE_SERVER_VERSION}"
export SG_TEST_BUCKET_NUM_REPLICAS=1
Expand Down

0 comments on commit 03e32ab

Please sign in to comment.