diff --git a/.github/workflows/shared-run-e2e.yml b/.github/workflows/shared-run-e2e.yml index 5068c31..a770c47 100644 --- a/.github/workflows/shared-run-e2e.yml +++ b/.github/workflows/shared-run-e2e.yml @@ -155,6 +155,8 @@ jobs: matrix: containers: [1, 2, 3, 4, 5, 6, 7, 8] steps: + - name: Checkout + uses: actions/checkout@v6 - name: Start e2e env id: start-e2e-env uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v10 @@ -177,9 +179,7 @@ jobs: start_jore3_importer: "${{ inputs.start_jore3_importer }}" - name: Seed infrastructure links - uses: HSLdevcom/jore4-tools/github-actions/seed-infrastructure-links@seed-infrastructure-links-v3 - with: - seed_data_commit_sha: "${{ steps.start-e2e-env.outputs.e2e_source_commit_sha }}" + uses: HSLdevcom/jore4-tools/github-actions/seed-infrastructure-links@seed-infrastructure-links-v4 - name: Seed municipalities and fare zones uses: HSLdevcom/jore4-tools/github-actions/seed-municipalities-and-fare-zones@seed-municipalities-and-fare-zones-v2 diff --git a/.gitignore b/.gitignore index 92e1e78..2a01444 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ test_users.json +infraLinks.sql diff --git a/github-actions/seed-infrastructure-links/action.yml b/github-actions/seed-infrastructure-links/action.yml index 2c411e5..7e4d7d7 100644 --- a/github-actions/seed-infrastructure-links/action.yml +++ b/github-actions/seed-infrastructure-links/action.yml @@ -6,9 +6,6 @@ inputs: description: Database connection string required: false default: "postgresql://dbadmin:adminpassword@localhost:5432/jore4e2e" - seed_data_commit_sha: - description: The commit SHA of jore4-ui repository from which infrastructure links seed data is read from - required: true runs: using: "composite" @@ -16,8 +13,8 @@ runs: - name: Fetch infrastructure link dump shell: bash run: | - curl https://raw.githubusercontent.com/HSLdevcom/jore4-ui/${{ inputs.seed_data_commit_sha }}/test-db-manager/src/dumps/infraLinks/infraLinks.sql \ - -o infraLinks.sql + curl https://stjore4dev001.blob.core.windows.net/jore4-ui/2025-09-24-infraLinks.sql -o infraLinks.sql + - name: Verify that testdb is up, running and migrated uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1