Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/shared-run-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ jobs:
steps:
- name: Start e2e env
id: start-e2e-env
uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v9
uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v10
with:
docker_compose_bundle_gha_artifact: "${{ inputs.docker_compose_bundle_gha_artifact }}"
ui_version: "${{ inputs.ui_version }}"
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -246,15 +246,15 @@ Parameters:

Example usage:

```
- uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v9
```yaml
- uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v10
with:
ui_version: 'docker.registry.example.org/jore4-ui:latest'
```

```
```yaml
steps:
- uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v9
- uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v10
with:
custom_docker_compose: ./docker/docker-compose.custom.yml
```
Expand Down
13 changes: 7 additions & 6 deletions github-actions/setup-e2e-environment/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ runs:
- name: Verify that UI is up and running through proxy
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
with:
command: "curl --fail http://localhost:3300 --output /dev/null --silent"
command: "curl --fail https://e2e.local.jore.hsldev.com --output /dev/null --silent"

- name: Verify that postgresql is up and running
id: verify_postgresql_started
Expand Down Expand Up @@ -242,7 +242,8 @@ runs:
- 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 https://e2e.local.jore.hsldev.com/api/graphql/healthz --output
/dev/null --silent"

- name: Verify that auth backend is up and running standalone
Expand All @@ -263,7 +264,7 @@ runs:
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
with:
command:
"curl --fail http://localhost:3300/api/auth/actuator/health --output
"curl --fail https://e2e.local.jore.hsldev.com/api/auth/actuator/health --output
/dev/null --silent"

- name: Verify that jore3 importer is up and running standalone
Expand All @@ -289,7 +290,7 @@ runs:
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
with:
command:
"curl --fail http://localhost:3300/api/mbtiles/services --output
"curl --fail https://e2e.local.jore.hsldev.com/api/mbtiles/services --output
/dev/null --silent"

- name: Verify that hastus importer is up and running standalone
Expand All @@ -303,7 +304,7 @@ runs:
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
with:
command:
"curl --fail http://localhost:3300/api/hastus/actuator/health --output
"curl --fail https://e2e.local.jore.hsldev.com/api/hastus/actuator/health --output
/dev/null --silent"

- name: Verify that timetables-api is up and running standalone
Expand All @@ -328,7 +329,7 @@ runs:
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
with:
command:
"curl --fail http://localhost:3300/api/mapmatching/actuator/health
"curl --fail https://e2e.local.jore.hsldev.com/api/mapmatching/actuator/health
--output /dev/null --silent"

- name: Verify that tiamat is up and running standalone
Expand Down