fix gotestsum

Author: torcolvin

integration-test/start_server.sh

@@ -49,7 +49,7 @@ fi
 set +e
 AMAZON_LINUX_2=$(grep 'Amazon Linux 2"' /etc/os-release)
 set -e
-if [[ -n "${AMAZON_LINUX_2}" ]]; then
+if [[ -n ${AMAZON_LINUX_2}   ]]; then
     DOCKER_COMPOSE="docker-compose" # use docker-compose v1 for Jenkins AWS Linux 2
 else
     DOCKER_COMPOSE="docker compose"
@@ -63,7 +63,7 @@ docker rm ${SG_TEST_COUCHBASE_SERVER_DOCKER_NAME} || true
 # --volume: Makes and mounts a CBS folder for storing a CBCollect if needed
 
 # use dockerhub if no registry is specified, allows for pre-release images from alternative registries
-if [[ ! "${COUCHBASE_DOCKER_IMAGE_NAME}" =~ ghcr.io/* && "${DOCKERHUB:-}" != "false" ]]; then
+if [[ ! ${COUCHBASE_DOCKER_IMAGE_NAME} =~ ghcr.io/* && ${DOCKERHUB:-} != "false"     ]]; then
     COUCHBASE_DOCKER_IMAGE_NAME="couchbase/server:${COUCHBASE_DOCKER_IMAGE_NAME}"
 fi
 

jenkins-integration-build.sh

@@ -56,9 +56,9 @@ if [ "${USE_GO_MODULES:-}" == "false" ]; then
     go get -u -v github.com/axw/gocov/gocov
     go get -u -v github.com/AlekSi/gocov-xml
 else
-    go install -v github.com/axw/gocov/gocov@latest
-    go install -v github.com/AlekSi/gocov-xml@latest
-    go install -v gotest.tools/gotestsum@latest
+    go install github.com/axw/gocov/gocov@latest
+    go install github.com/AlekSi/gocov-xml@latest
+    go install gotest.tools/gotestsum@latest
 fi
 
 if [ "${SG_TEST_X509:-}" == "true" -a "${COUCHBASE_SERVER_PROTOCOL}" != "couchbases" ]; then
@@ -106,9 +106,9 @@ fi
 
 if [ "${RUN_WALRUS}" == "true" ]; then
     # EE
-    gotestsum --junitfile verbose_unit_ee.xml --format standard-verbose --  -coverprofile=coverage_walrus_ee.out -coverpkg=github.com/couchbase/sync_gateway/... -tags cb_sg_devmode,cb_sg_enterprise $GO_TEST_FLAGS github.com/couchbase/sync_gateway/${TARGET_PACKAGE} > verbose_unit_ee.out 2>&1 | true
+    gotestsum --junitfile verbose_unit_ee.xml --junit-project-name rosmar-EE --format standard-verbose --  -coverprofile=coverage_walrus_ee.out -coverpkg=github.com/couchbase/sync_gateway/... -tags cb_sg_devmode,cb_sg_enterprise $GO_TEST_FLAGS ${TARGET_PACKAGE} > verbose_unit_ee.out 2>&1 | true
     # CE
-    gotestsum --junitfile verbose_unit_ce.xml --format standard-verbose -- -coverprofile=coverage_walrus_ce.out -coverpkg=github.com/couchbase/sync_gateway/... -tags cb_sg_devmode $GO_TEST_FLAGS github.com/couchbase/sync_gateway/${TARGET_PACKAGE} > verbose_unit_ce.out 2>&1 | true
+    gotestsum --junitfile verbose_unit_ce.xml --format standard-verbose --junit-project-name rosmar-CE -- -coverprofile=coverage_walrus_ce.out -coverpkg=github.com/couchbase/sync_gateway/... -tags cb_sg_devmode $GO_TEST_FLAGS ${TARGET_PACKAGE} > verbose_unit_ce.out 2>&1 | true
 fi
 
 # Run CBS
@@ -137,7 +137,7 @@ else
     GO_TEST_FLAGS="${GO_TEST_FLAGS} -tags cb_sg_devmode"
 fi
 
-gotestsum --junitfile="${INT_LOG_FILE_NAME}.xml" --format standard-verbose -- ${GO_TEST_FLAGS} -coverprofile=coverage_int.out -coverpkg=github.com/couchbase/sync_gateway/... github.com/couchbase/sync_gateway/${TARGET_PACKAGE} 2>&1 | stdbuf -oL tee "${INT_LOG_FILE_NAME}.out" | stdbuf -oL grep -a -E '(--- (FAIL|PASS|SKIP):|github.com/couchbase/sync_gateway(/.+)?\t|TEST: |panic: )'
+gotestsum --junitfile="${INT_LOG_FILE_NAME}.xml" --junit-project-name --format standard-verbose -- ${GO_TEST_FLAGS} -coverprofile=coverage_int.out -coverpkg=github.com/couchbase/sync_gateway/... ${TARGET_PACKAGE} 2>&1 | stdbuf -oL tee "${INT_LOG_FILE_NAME}.out" | stdbuf -oL grep -a -E '(--- (FAIL|PASS|SKIP):|github.com/couchbase/sync_gateway(/.+)?\t|TEST: |panic: )'
 if [ "${PIPESTATUS[0]}" -ne "0" ]; then # If test exit code is not 0 (failed)
     echo "Go test failed! Parsing logs to find cause..."
     TEST_FAILED=true