Skip to content

Commit 306183f

Browse files
author
Janne Rönkkö
committed
Reorder e2e setup verifys
1 parent 02210b1 commit 306183f

File tree

1 file changed

+34
-34
lines changed

1 file changed

+34
-34
lines changed

.github/workflows/shared-run-e2e.yml

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -252,16 +252,6 @@ jobs:
252252
run: docker ps
253253
shell: bash
254254

255-
- name: Verify that UI is up and running standalone
256-
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
257-
with:
258-
command: "curl --fail http://localhost:3302 --output /dev/null --silent"
259-
260-
- name: Verify that UI is up and running through proxy
261-
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
262-
with:
263-
command: "curl --fail http://localhost:3300 --output /dev/null --silent"
264-
265255
- name: Verify that postgresql is up and running
266256
id: verify_postgresql_started
267257
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
@@ -276,6 +266,11 @@ jobs:
276266
docker logs testdb
277267
shell: bash
278268

269+
- name: Verify that map matching database is up and running standalone
270+
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
271+
with:
272+
command: "pg_isready -h localhost -p 6433"
273+
279274
- name: Verify that mssql testdb is up and running
280275
id: verify_mssql_started
281276
if: ${{ inputs.start_jore3_importer == 'true' }}
@@ -308,36 +303,25 @@ jobs:
308303
docker logs mssqltestdb
309304
shell: bash
310305

311-
- name: Verify that hasura is up and running standalone
312-
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
313-
with:
314-
command: "curl --fail http://localhost:3201/healthz --output /dev/null --silent"
315-
316-
- name: Verify that hasura is up and running through proxy
306+
- name: Verify that UI is up and running standalone
317307
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
318308
with:
319-
command: "curl --fail http://localhost:3300/api/graphql/healthz --output
320-
/dev/null --silent"
309+
command: "curl --fail http://localhost:3302 --output /dev/null --silent"
321310

322-
- name: Verify that auth backend is up and running standalone
311+
- name: Verify that UI is up and running through proxy
323312
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
324313
with:
325-
command:
326-
"curl --fail http://localhost:3200/actuator/health --output /dev/null
327-
--silent"
314+
command: "curl --fail http://localhost:3300 --output /dev/null --silent"
328315

329-
- name: Verify that auth backend has access to database
316+
- name: Verify that hasura is up and running standalone
330317
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
331318
with:
332-
command:
333-
"curl --fail http://localhost:3200/public/v1/login --output /dev/null
334-
--silent"
319+
command: "curl --fail http://localhost:3201/healthz --output /dev/null --silent"
335320

336-
- name: Verify that auth backend is up and running through proxy
321+
- name: Verify that hasura is up and running through proxy
337322
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
338323
with:
339-
command:
340-
"curl --fail http://localhost:3300/api/auth/actuator/health --output
324+
command: "curl --fail http://localhost:3300/api/graphql/healthz --output
341325
/dev/null --silent"
342326

343327
- name: Verify that mbtiles server is up and running standalone
@@ -361,11 +345,6 @@ jobs:
361345
"curl --fail http://localhost:3004/actuator/health --output /dev/null
362346
--silent"
363347

364-
- name: Verify that map matching database is up and running standalone
365-
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
366-
with:
367-
command: "pg_isready -h localhost -p 6433"
368-
369348
- name: Verify that map matching server is up and running standalone
370349
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
371350
with:
@@ -405,6 +384,27 @@ jobs:
405384
command: "curl --fail http://localhost:3009/actuator/health --output
406385
/dev/null --silent"
407386

387+
- name: Verify that auth backend is up and running standalone
388+
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
389+
with:
390+
command:
391+
"curl --fail http://localhost:3200/actuator/health --output /dev/null
392+
--silent"
393+
394+
- name: Verify that auth backend has access to database
395+
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
396+
with:
397+
command:
398+
"curl --fail http://localhost:3200/public/v1/login --output /dev/null
399+
--silent"
400+
401+
- name: Verify that auth backend is up and running through proxy
402+
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
403+
with:
404+
command:
405+
"curl --fail http://localhost:3300/api/auth/actuator/health --output
406+
/dev/null --silent"
407+
408408
- name: Verify that tiamat is up and running standalone
409409
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
410410
with:

0 commit comments

Comments
 (0)