From 28487080fb8d95afaa8a3755fd0818d27697ad8d Mon Sep 17 00:00:00 2001 From: Sarah G Date: Fri, 18 Aug 2023 12:36:09 +0200 Subject: [PATCH] Edit test-alive script --- Makefile | 5 ----- infra/scripts/test-alive.sh | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 0901fb09..2e4da21e 100644 --- a/Makefile +++ b/Makefile @@ -39,11 +39,6 @@ else TAG=${TAG} ${DC} -f docker-compose-$*.yml up -d endif -test-frontend-alive: - ${DC} --profile app -f docker-compose-dev.yml up -d - sleep 10 - curl -s -o /dev/null localhost:8080 - down-%: ${DC} -f docker-compose-$*.yml down diff --git a/infra/scripts/test-alive.sh b/infra/scripts/test-alive.sh index bc151f61..4fbd26b9 100755 --- a/infra/scripts/test-alive.sh +++ b/infra/scripts/test-alive.sh @@ -10,7 +10,7 @@ test_result=1 TAG=$(make get-current-version) until [ "$elapse" -ge "$timeout" -o "$test_result" -eq "0" ] ; do - [[ "$(curl -L -s $1/api/)" == "Basegun backend" ]] + [[ "$(curl -L -s $1/api/version)" == "$TAG" ]] test_result=$? if [ "$test_result" -gt "0" ] ; then echo "Waited $elapse seconds";