diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 48d1d33..84ae5bc 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -86,5 +86,11 @@ jobs: run_cypress_tests: needs: - run_kotlin_tests - - publish_docker_image_to_docker_hub - uses: ./.github/workflows/run-cypress-tests.yml + - publish_docker_image_to_acr + name: Run E2E tests + runs-on: ubuntu-24.04 + steps: + - name: Start e2e env + uses: HSLdevcom/jore4-tools/github-actions/run-ci@main + with: + timetablesapi_version: "${{ needs.publish_docker_image_to_acr.outputs.docker_image }}" diff --git a/.github/workflows/run-cypress-tests.yml b/.github/workflows/run-cypress-tests.yml deleted file mode 100644 index cd9de15..0000000 --- a/.github/workflows/run-cypress-tests.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Run cypress tests - -on: - # this workflow is only called by others, won't be executed on itself - # as it uses the pre-built docker image that is produced in the upstream job - workflow_call: - -jobs: - run_cypress_tests: - name: Run cypress e2e tests from docker - runs-on: ubuntu-24.04 - - steps: - - name: Extract metadata to env variables - uses: HSLdevcom/jore4-tools/github-actions/extract-metadata@extract-metadata-v1 - - - name: Start e2e env - uses: HSLdevcom/jore4-tools/github-actions/run-ci@main - with: - timetablesapi_version: "${{ env.IMAGE_NAME }}:${{ env.COMMIT_ID }}"