From 03e32abf874e26d28d58eb9190fd9971112797f3 Mon Sep 17 00:00:00 2001 From: Ben Brooks Date: Thu, 27 Apr 2023 10:40:44 +0100 Subject: [PATCH] Set default for MULTI_NODE to avoid unbound variable error (#6216) --- integration-test/start_server.sh | 4 ++-- jenkins-integration-build.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-test/start_server.sh b/integration-test/start_server.sh index d1bf9edaa6..53a04c0c21 100755 --- a/integration-test/start_server.sh +++ b/integration-test/start_server.sh @@ -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 @@ -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) diff --git a/jenkins-integration-build.sh b/jenkins-integration-build.sh index 0a4ca9b619..509d0f52ee 100755 --- a/jenkins-integration-build.sh +++ b/jenkins-integration-build.sh @@ -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