Simplify warehouses end-to-end tests.

Author: martyngigg

.github/actions/run-pytest-with-uv/action.yml

@@ -5,9 +5,9 @@ inputs:
   compose-file-path:
     description: If supplied, brings up the services defined in the given docker compose file.
     default: ""
-  install-cmd:
-    description: The uv command to install the project
-    default: "uv sync --locked --all-extras --dev"
+  pyproject-directory:
+    description: Path to the directory containing pyproject.toml
+    required: true
   pytest-file-or-dir:
     description: Path to a file or directory for pytest execution
     required: true
@@ -19,9 +19,6 @@ inputs:
   uv-version:
     description: The version of uv to install e.g., `0.5.0` Defaults to the version in pyproject.toml or 'latest'.
     default: "latest"
-  working-directory:
-    description: Working directory while running pytest
-    required: true
 
 runs:
   using: composite
@@ -44,13 +41,13 @@ runs:
 
     - name: Install the project
       shell: bash -l {0}
-      run: ${{ inputs.install-cmd }}
-      working-directory: ${{ inputs.working-directory }}
+      run: uv sync --locked --all-extras --dev
+      working-directory: ${{ inputs.pyproject-directory }}
 
     - name: Run tests
       shell: bash -l {0}
       run: uv run pytest --durations-min=0.5 --exitfirst "${{ inputs.pytest-file-or-dir }}" --cache-clear
-      working-directory: ${{ inputs.working-directory }}
+      working-directory: ${{ inputs.pyproject-directory }}
 
     - name: Dump Docker Compose logs on failure
       if: failure() && inputs.compose-file-path != ''

.github/workflows/elt-common_e2e_tests.yml

@@ -41,12 +41,11 @@ jobs:
         uses: ./.github/actions/run-pytest-with-uv
         with:
           compose-file-path: infra/local/docker-compose.yml
+          pyproject-directory: elt-common
           pytest-file-or-dir: tests/e2e_tests
           uv-cache-dependency-glob: elt-common/pyproject.toml
-          working-directory: elt-common
 
       - name: Remove adp-router from /etc/hosts
-        if: always()
         shell: bash -l {0}
         run: |
           sudo sed -i -e '/adp-router/d' /etc/hosts

.github/workflows/elt-common_unit_tests.yml

@@ -28,6 +28,6 @@ jobs:
       - name: Run unit tests
         uses: ./.github/actions/run-pytest-with-uv
         with:
+          pyproject-directory: elt-common
           pytest-file-or-dir: tests/unit_tests
           uv-cache-dependency-glob: elt-common/pyproject.toml
-          working-directory: elt-common

.github/workflows/warehouses_e2e_tests.yml

@@ -18,6 +18,10 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
+env:
+  PYTHON_VERSION: 3.13
+  UV_VERSION: latest
+
 jobs:
   test:
     name: warehouses end-to-end tests
@@ -27,19 +31,37 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
+      - name: Bring up Docker Compose services
+        uses: hoverkraft-tech/compose-action@v2.3.0
+        with:
+          compose-file: infra/local/docker-compose.yml
+          up-flags: --quiet-pull --wait --wait-timeout 300
+          down-flags: --volumes --remove-orphans
+
       - name: Add adp-router to /etc/hosts
         shell: bash -l {0}
         run: |
           echo "127.0.0.1    adp-router" | sudo tee -a /etc/hosts
 
-      - name: Run end-to-end tests
-        uses: ./.github/actions/run-pytest-with-uv
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
         with:
-          compose-file-path: infra/local/docker-compose.yml
-          install-cmd: uv sync --locked --script extract_and_load.py
-          pytest-file-or-dir: tests
-          uv-cache-dependency-glob: elt-common/pyproject.toml
-          working-directory: warehouses/accelerator/extract_load/opralogweb
+          activate-environment: true
+          version: ${{ env.UV_VERSION }}
+          python-version: ${{ env.PYTHON_VERSION }}
+
+      - name: Install dependencies
+        shell: bash -l {0}
+        run: |
+          uv sync --active --script extract_and_load.py
+          uv pip install pytest
+        working-directory: warehouses/accelerator/extract_load/opralogweb
+
+      - name: Run tests
+        shell: bash -l {0}
+        run: |
+          uv run --active pytest --durations-min=0.5 --exitfirst tests --cache-clear
+        working-directory: warehouses/accelerator/extract_load/opralogweb
 
       - name: Remove adp-router from /etc/hosts
         if: always()