diff --git a/.github/workflows/shared-run-e2e.yml b/.github/workflows/shared-run-e2e.yml index f7c1212..0f266a9 100644 --- a/.github/workflows/shared-run-e2e.yml +++ b/.github/workflows/shared-run-e2e.yml @@ -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-v10 + uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v9 with: docker_compose_bundle_gha_artifact: "${{ inputs.docker_compose_bundle_gha_artifact }}" ui_version: "${{ inputs.ui_version }}" diff --git a/README.md b/README.md index a74536e..dbb934e 100644 --- a/README.md +++ b/README.md @@ -246,15 +246,15 @@ Parameters: Example usage: -```yaml -- uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v10 +``` +- uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v9 with: ui_version: 'docker.registry.example.org/jore4-ui:latest' ``` -```yaml +``` steps: -- uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v10 +- uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v9 with: custom_docker_compose: ./docker/docker-compose.custom.yml ``` diff --git a/github-actions/setup-e2e-environment/action.yml b/github-actions/setup-e2e-environment/action.yml index 65d4fb5..a38257a 100644 --- a/github-actions/setup-e2e-environment/action.yml +++ b/github-actions/setup-e2e-environment/action.yml @@ -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 https://e2e.local.jore.hsldev.com --output /dev/null --silent" + command: "curl --fail http://localhost:3300 --output /dev/null --silent" - name: Verify that postgresql is up and running id: verify_postgresql_started @@ -242,8 +242,7 @@ runs: - name: Verify that hasura is up and running through proxy uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1 with: - command: - "curl --fail https://e2e.local.jore.hsldev.com/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 @@ -264,7 +263,7 @@ runs: uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1 with: command: - "curl --fail https://e2e.local.jore.hsldev.com/api/auth/actuator/health --output + "curl --fail http://localhost:3300/api/auth/actuator/health --output /dev/null --silent" - name: Verify that jore3 importer is up and running standalone @@ -290,7 +289,7 @@ runs: uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1 with: command: - "curl --fail https://e2e.local.jore.hsldev.com/api/mbtiles/services --output + "curl --fail http://localhost:3300/api/mbtiles/services --output /dev/null --silent" - name: Verify that hastus importer is up and running standalone @@ -304,7 +303,7 @@ runs: uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1 with: command: - "curl --fail https://e2e.local.jore.hsldev.com/api/hastus/actuator/health --output + "curl --fail http://localhost:3300/api/hastus/actuator/health --output /dev/null --silent" - name: Verify that timetables-api is up and running standalone @@ -329,7 +328,7 @@ runs: uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1 with: command: - "curl --fail https://e2e.local.jore.hsldev.com/api/mapmatching/actuator/health + "curl --fail http://localhost:3300/api/mapmatching/actuator/health --output /dev/null --silent" - name: Verify that tiamat is up and running standalone