Fetch seed data from the same commit from which the used Cypress Docker image was built from

Author: Janne Rönkkö

README.md

@@ -199,14 +199,14 @@ Parameters:
 Example usage:
 
 ```
-- uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v8
+- uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v9
   with:
     ui_version: 'docker.registry.example.org/jore4-ui:latest'
 ```
 
 ```
 steps:
-- uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v8
+- uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v9
   with:
     custom_docker_compose: ./docker/docker-compose.custom.yml
 ```
@@ -226,12 +226,12 @@ Example usage:
 
 ```
 steps:
-- uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v8
+- uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v9
 - uses: HSLdevcom/jore4-tools/github-actions/run-cypress-tests@run-cypress-tests-v1
 ```
 
 ```
-- uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v8
+- uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v9
   with:
     ui_version: 'docker.registry.example.org/jore4-ui:latest'
 

github-actions/run-ci/action.yml

@@ -111,7 +111,8 @@ runs:
   using: composite
   steps:
     - name: Start e2e env
-      uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v8
+      id: start-e2e-env
+      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 }}"
@@ -131,10 +132,14 @@ runs:
         start_jore3_importer: "${{ inputs.start_jore3_importer }}"
 
     - name: Seed infrastructure links
-      uses: HSLdevcom/jore4-tools/github-actions/seed-infrastructure-links@seed-infrastructure-links-v2
+      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 }}"
 
     - name: Seed municipalities and fare zones
-      uses: HSLdevcom/jore4-tools/github-actions/seed-municipalities-and-fare-zones@seed-municipalities-and-fare-zones-v1
+      uses: HSLdevcom/jore4-tools/github-actions/seed-municipalities-and-fare-zones@seed-municipalities-and-fare-zones-v2
+      with:
+        seed_data_commit_sha: "${{ steps.start-e2e-env.outputs.e2e_source_commit_sha }}"
 
     - name: Run e2e tests
       env:

github-actions/seed-infrastructure-links/action.yml

@@ -6,14 +6,17 @@ 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"
   steps:
     - name: Fetch infrastructure link dump
       shell: bash
       run: |
-        curl https://raw.githubusercontent.com/HSLdevcom/jore4-ui/main/test-db-manager/src/dumps/infraLinks/infraLinks.sql \
+        curl https://raw.githubusercontent.com/HSLdevcom/jore4-ui/${{ inputs.seed_data_commit_sha }}/test-db-manager/src/dumps/infraLinks/infraLinks.sql \
           -o infraLinks.sql
 
     - name: Verify that testdb is up, running and migrated

github-actions/seed-municipalities-and-fare-zones/action.yml

@@ -5,14 +5,17 @@ inputs:
     description: Import endpoint of Tiamat
     required: false
     default: "localhost:3010/services/stop_places/netex"
+  seed_data_commit_sha:
+    description: The commit SHA of jore4-ui repository from which municipalities and fare zones seed data is read from
+    required: true
 
 runs:
   using: "composite"
   steps:
     - name: Fetch netex import file
       shell: bash
       run: |
-        curl https://raw.githubusercontent.com/HSLdevcom/jore4-ui/main/netex/hsl-zones-netex.xml \
+        curl https://raw.githubusercontent.com/HSLdevcom/jore4-ui/${{ inputs.seed_data_commit_sha }}/netex/hsl-zones-netex.xml \
           -o hsl-zones-netex.xml
 
     - name: Verify that tiamat is up and wait if needed

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

@@ -99,6 +99,11 @@ inputs:
     required: false
     default: "false"
 
+outputs:
+  e2e_source_commit_sha:
+    description: The commit SHA from which E2E tests were built from
+    value: ${{ steps.extract-metadata.outputs.e2e_source_commit_sha }}
+
 runs:
   using: "composite"
   steps:
@@ -315,3 +320,9 @@ runs:
     - name: Verify that all containers are healthy
       run: '[ -z "$(docker ps -q --filter health=unhealthy)" ]'
       shell: bash
+
+    - name: Extract metadata
+      id: extract-metadata
+      shell: bash
+      run: |
+        echo e2e_source_commit_sha=$(docker inspect cypress -f '{{ .Config.Labels.git_sha }}') >> ${GITHUB_OUTPUT}