Move infrastructure link seeding to separate action

Author: eleksi

.github/workflows/test-run-cypress-tests-action.yml

@@ -15,9 +15,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Start e2e env
-        env:
-          INFRASTRUCTURE_LINK_DUMP_PATH: infraLinks.sql
         uses: ./github-actions/setup-e2e-environment
 
+      - name: Seed infrastructure links
+        uses: ./github-actions/seed-infrastructure-links
+
       - name: Run e2e tests from github action
         uses: ./github-actions/run-cypress-tests

.github/workflows/test-setup-e2e-environment-action.yml

@@ -8,8 +8,6 @@ on:
 jobs:
   test-e2e-setup-action:
     runs-on: ubuntu-20.04
-    env:
-      INFRASTRUCTURE_LINK_DUMP_PATH: infraLinks.sql
 
     strategy:
       matrix:
@@ -116,27 +114,5 @@ jobs:
             exit 1
           fi
 
-      - name: Set up PostgreSQL client
-        run: |
-          sudo apt-get -yqq install postgresql-client
-
-      - name: Fetch infrastructure link dump
-        run: |
-          curl https://raw.githubusercontent.com/HSLdevcom/jore4-ui/main/test-db-manager/src/dumps/infraLinks/infraLinks.sql \
-            -o ${{ env.INFRASTRUCTURE_LINK_DUMP_PATH }}
-
-      - name: Seed db1 with infrastructure links
-        run: |
-          psql postgresql://dbadmin:adminpassword@localhost:6532/jore4e2e < ${{ env.INFRASTRUCTURE_LINK_DUMP_PATH }}
-
-      - name: Seed db2 with infrastructure links
-        run: |
-          psql postgresql://dbadmin:adminpassword@localhost:6533/jore4e2e < ${{ env.INFRASTRUCTURE_LINK_DUMP_PATH }}
-
-      - name: Seed db3 with infrastructure links
-        run: |
-          psql postgresql://dbadmin:adminpassword@localhost:6534/jore4e2e < ${{ env.INFRASTRUCTURE_LINK_DUMP_PATH }}
-
-      - name: Seed db4 with infrastructure links
-        run: |
-          psql postgresql://dbadmin:adminpassword@localhost:6432/jore4e2e < ${{ env.INFRASTRUCTURE_LINK_DUMP_PATH }}
+      - name: Seed infrastructure links
+        uses: ./github-actions/seed-infrastructure-links

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

@@ -0,0 +1,37 @@
+name: "Seed infrastructure links"
+description:
+  "Seeds infrastructure links needed in e2e tests"
+
+runs:
+  using: "composite"
+  steps:
+    - name: Set up PostgreSQL client
+      shell: bash
+      run: |
+        sudo apt-get -yqq install postgresql-client
+
+    - 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 \
+          -o infraLinks.sql
+
+    - name: Seed db1 with infrastructure links
+      shell: bash
+      run: |
+        psql postgresql://dbadmin:adminpassword@localhost:6532/jore4e2e < infraLinks.sql
+
+    - name: Seed db2 with infrastructure links
+      shell: bash
+      run: |
+        psql postgresql://dbadmin:adminpassword@localhost:6533/jore4e2e < infraLinks.sql
+
+    - name: Seed db3 with infrastructure links
+      shell: bash
+      run: |
+        psql postgresql://dbadmin:adminpassword@localhost:6534/jore4e2e < infraLinks.sql
+
+    - name: Seed db4 with infrastructure links
+      shell: bash
+      run: |
+        psql postgresql://dbadmin:adminpassword@localhost:6432/jore4e2e < infraLinks.sql

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

@@ -289,34 +289,3 @@ runs:
     - name: Verify that all containers are healthy
       run: '[ -z "$(docker ps -q --filter health=unhealthy)" ]'
       shell: bash
-
-    - name: Set up PostgreSQL client
-      shell: bash
-      run: |
-        sudo apt-get -yqq install postgresql-client
-
-    - 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 \
-          -o ${{ env.INFRASTRUCTURE_LINK_DUMP_PATH }}
-
-    - name: Seed db1 with infrastructure links
-      shell: bash
-      run: |
-        psql postgresql://dbadmin:adminpassword@localhost:6532/jore4e2e < ${{ env.INFRASTRUCTURE_LINK_DUMP_PATH }}
-
-    - name: Seed db2 with infrastructure links
-      shell: bash
-      run: |
-        psql postgresql://dbadmin:adminpassword@localhost:6533/jore4e2e < ${{ env.INFRASTRUCTURE_LINK_DUMP_PATH }}
-
-    - name: Seed db3 with infrastructure links
-      shell: bash
-      run: |
-        psql postgresql://dbadmin:adminpassword@localhost:6534/jore4e2e < ${{ env.INFRASTRUCTURE_LINK_DUMP_PATH }}
-
-    - name: Seed db4 with infrastructure links
-      shell: bash
-      run: |
-        psql postgresql://dbadmin:adminpassword@localhost:6432/jore4e2e < ${{ env.INFRASTRUCTURE_LINK_DUMP_PATH }}