From 64b480d3e9411ff153390fff393533bc79e70026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Teemu=20M=C3=A4kinen?= Date: Mon, 12 Feb 2024 09:50:44 +0200 Subject: [PATCH 1/2] Add timetables-api to health check --- github-actions/setup-e2e-environment/action.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/github-actions/setup-e2e-environment/action.yml b/github-actions/setup-e2e-environment/action.yml index ab3a8c0..7000ffa 100644 --- a/github-actions/setup-e2e-environment/action.yml +++ b/github-actions/setup-e2e-environment/action.yml @@ -247,6 +247,12 @@ runs: "curl --fail http://localhost:3300/api/hastus/actuator/health --output /dev/null --silent" + - name: Verify that timetables-api is up and running standalone + uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1 + with: + command: "curl --fail http://localhost:3009/actuator/health --output + /dev/null --silent" + - name: Verify that all containers are healthy run: '[ -z "$(docker ps -q --filter health=unhealthy)" ]' shell: bash From 154d00c2161dd55b2c771e079f5f45562b9dc5a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Teemu=20M=C3=A4kinen?= Date: Mon, 12 Feb 2024 09:50:52 +0200 Subject: [PATCH 2/2] Add tiamat to health check --- .../setup-e2e-environment/action.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/github-actions/setup-e2e-environment/action.yml b/github-actions/setup-e2e-environment/action.yml index 7000ffa..39b8eb2 100644 --- a/github-actions/setup-e2e-environment/action.yml +++ b/github-actions/setup-e2e-environment/action.yml @@ -4,8 +4,7 @@ description: running." inputs: bundle_version: - description: - Version of the docker-compose bundle to use (= github release version) + description: Version of the docker-compose bundle to use (= github release version) required: false default: "e2e-docker-compose" bundle_repo: @@ -157,14 +156,12 @@ runs: - name: Verify that hasura is up and running standalone uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1 with: - command: - "curl --fail http://localhost:3201/healthz --output /dev/null --silent" + command: "curl --fail http://localhost:3201/healthz --output /dev/null --silent" - name: Verify that hasura is up and running through proxy uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1 with: - command: - "curl --fail http://localhost:3300/api/graphql/healthz --output + command: "curl --fail http://localhost:3300/api/graphql/healthz --output /dev/null --silent" - name: Verify that auth backend is up and running standalone @@ -191,8 +188,7 @@ runs: - name: Verify that mbtiles server is up and running standalone uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1 with: - command: - "curl --fail http://localhost:3203/services --output /dev/null + command: "curl --fail http://localhost:3203/services --output /dev/null --silent" - name: Verify that mbtiles server is up and running through proxy @@ -253,6 +249,12 @@ runs: command: "curl --fail http://localhost:3009/actuator/health --output /dev/null --silent" + - name: Verify that tiamat is up and running standalone + uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1 + with: + command: "curl --fail http://localhost:3010/actuator/health --output + /dev/null --silent" + - name: Verify that all containers are healthy run: '[ -z "$(docker ps -q --filter health=unhealthy)" ]' shell: bash