Improve compose test script

ba-st · Feb 18, 2022 · b107bdf · b107bdf
1 parent 4b17263
commit b107bdf
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/compose-test.sh b/compose-test.sh
@@ -7,14 +7,22 @@ if [[ -z "${GITHUB_HEAD_REF##*/}" ]]; then
 else
   echo "BRANCH_NAME=${GITHUB_HEAD_REF##*/}" > .env
 fi
-docker-compose -f api-tests/docker-compose.yml up -d
+echo "Building API"
+docker-compose -f api-tests/docker-compose.yml build api
+echo "Starting Consul Agent"
+docker-compose -f api-tests/docker-compose.yml up -d consul-agent
+sleep 1
+echo "Starting API"
+docker-compose -f api-tests/docker-compose.yml up -d api
 sleep 10
+echo "Testing API"
 curl --fail http://localhost:8080/echo/hello
 curl --fail http://localhost:8500/v1/agent/services
 curl --fail http://localhost:8500/v1/health/checks/echo
 HEALTH_STATUS=$(curl -s http://localhost:8500/v1/health/checks/echo | jq '.[0].Status')
-if [ "$HEALTH_STATUS" != "passing" ]; then
-  echo "ERROR: Echo service is unhealthy"
+echo "$HEALTH_STATUS"
+if [ "$HEALTH_STATUS" != '"passing"' ]; then
+  echo "Error: Echo service is unhealthy" >&2
   docker-compose -f api-tests/docker-compose.yml down
   exit 1
 fi