Skip to content

Commit dd1be91

Browse files
author
Janne Rönkkö
committed
Reorder service startup verify checks
As the checks use sleep, put the slowest services at the end to minimize the amount of sleeping
1 parent 0a422ea commit dd1be91

1 file changed

Lines changed: 26 additions & 26 deletions

File tree

github-actions/setup-e2e-environment/action.yml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -266,19 +266,6 @@ runs:
266266
"curl --fail http://localhost:3300/api/auth/actuator/health --output
267267
/dev/null --silent"
268268

269-
- name: Verify that mbtiles server is up and running standalone
270-
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
271-
with:
272-
command: "curl --fail http://localhost:3203/services --output /dev/null
273-
--silent"
274-
275-
- name: Verify that mbtiles server is up and running through proxy
276-
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
277-
with:
278-
command:
279-
"curl --fail http://localhost:3300/api/mbtiles/services --output
280-
/dev/null --silent"
281-
282269
- name: Verify that jore3 importer is up and running standalone
283270
if: ${{ inputs.start_jore3_importer == 'true' }}
284271
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
@@ -287,29 +274,23 @@ runs:
287274
"curl --fail http://localhost:3004/actuator/health --output /dev/null
288275
--silent"
289276

290-
- name: Verify that map matching database is up and running standalone
277+
- name: Verify that cypress test container is up and running standalone
291278
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
292279
with:
293-
command: "pg_isready -h localhost -p 6433"
280+
command: "docker exec cypress yarn cypress --version"
294281

295-
- name: Verify that map matching server is up and running standalone
282+
- name: Verify that mbtiles server is up and running standalone
296283
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
297284
with:
298-
command:
299-
"curl --fail http://localhost:3005/actuator/health --output /dev/null
285+
command: "curl --fail http://localhost:3203/services --output /dev/null
300286
--silent"
301287

302-
- name: Verify that map matching server is up and running through proxy
288+
- name: Verify that mbtiles server is up and running through proxy
303289
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
304290
with:
305291
command:
306-
"curl --fail http://localhost:3300/api/mapmatching/actuator/health
307-
--output /dev/null --silent"
308-
309-
- name: Verify that cypress test container is up and running standalone
310-
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
311-
with:
312-
command: "docker exec cypress yarn cypress --version"
292+
"curl --fail http://localhost:3300/api/mbtiles/services --output
293+
/dev/null --silent"
313294

314295
- name: Verify that hastus importer is up and running standalone
315296
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
@@ -331,6 +312,25 @@ runs:
331312
command: "curl --fail http://localhost:3009/actuator/health --output
332313
/dev/null --silent"
333314

315+
- name: Verify that map matching database is up and running standalone
316+
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
317+
with:
318+
command: "pg_isready -h localhost -p 6433"
319+
320+
- name: Verify that map matching server is up and running standalone
321+
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
322+
with:
323+
command:
324+
"curl --fail http://localhost:3005/actuator/health --output /dev/null
325+
--silent"
326+
327+
- name: Verify that map matching server is up and running through proxy
328+
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
329+
with:
330+
command:
331+
"curl --fail http://localhost:3300/api/mapmatching/actuator/health
332+
--output /dev/null --silent"
333+
334334
- name: Verify that tiamat is up and running standalone
335335
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
336336
with:

0 commit comments

Comments
 (0)