websever 01

Author: sanderegg

.github/workflows/_reusable-unit-test.yml

@@ -17,10 +17,25 @@ on:
         type: string
         default: "**/{service_name}/requirements/ci.txt"
         description: "Path pattern for dependencies to cache"
+      test_mode:
+        required: false
+        type: string
+        default: "standard"
+        description: "Test mode to run (standard, isolated, with_db)"
+      test_shard:
+        required: false
+        type: string
+        default: ""
+        description: "Test shard to run (e.g., 01, 02, 03, 04 for webserver)"
+      pre_test_step:
+        required: false
+        type: string
+        default: ""
+        description: "Additional step to run before the test step"
 
 jobs:
   unit_test:
-    name: "[unit] ${{ inputs.service_name }}"
+    name: "[unit] ${{ inputs.service_name }}${{ inputs.test_shard != '' && ' ' || '' }}${{ inputs.test_shard }}"
     timeout-minutes: ${{ inputs.timeout_minutes }}
     runs-on: ${{ matrix.os }}
     strategy:
@@ -51,9 +66,20 @@ jobs:
         run: ./ci/github/unit-testing/${{ inputs.service_name }}.bash install
       - name: typecheck
         run: ./ci/github/unit-testing/${{ inputs.service_name }}.bash typecheck
+      # Pre-test step if specified
+      - name: ${{ inputs.pre_test_step }}
+        if: ${{ inputs.pre_test_step != '' && !cancelled() }}
+        run: ./ci/github/unit-testing/${{ inputs.service_name }}.bash ${{ inputs.pre_test_step }}
+      # Test step with different modes
       - name: test
-        if: ${{ !cancelled() }}
+        if: ${{ inputs.test_mode == 'standard' && !cancelled() }}
         run: ./ci/github/unit-testing/${{ inputs.service_name }}.bash test
+      - name: test isolated
+        if: ${{ inputs.test_mode == 'isolated' && !cancelled() }}
+        run: ./ci/github/unit-testing/${{ inputs.service_name }}.bash test_isolated
+      - name: test with db
+        if: ${{ inputs.test_mode == 'with_db' && !cancelled() }}
+        run: ./ci/github/unit-testing/${{ inputs.service_name }}.bash test_with_db ${{ inputs.test_shard }}
       - name: upload failed tests logs
         if: ${{ failure() }}
         uses: actions/upload-artifact@v4

.github/workflows/ci-testing-deploy.yml

@@ -283,50 +283,15 @@ jobs:
   unit-test-webserver-01:
     needs: changes
     if: ${{ needs.changes.outputs.webserver == 'true' || github.event_name == 'push' || github.event.inputs.force_all_builds == 'true' }}
-    timeout-minutes: 25 # if this timeout gets too small, then split the tests
-    name: "[unit] webserver 01"
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        python: ["3.11"]
-        os: [ubuntu-24.04]
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v4
-      - name: setup docker buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          driver: docker-container
-      - name: setup python environment
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python }}
-      - name: install uv
-        uses: astral-sh/setup-uv@v6
-        with:
-          version: "0.6.x"
-          enable-cache: false
-          cache-dependency-glob: "**/web/server/requirements/ci.txt"
-      - name: show system version
-        run: ./ci/helpers/show_system_versions.bash
-      - name: install webserver
-        run: ./ci/github/unit-testing/webserver.bash install
-      - name: typecheck
-        run: ./ci/github/unit-testing/webserver.bash typecheck
-      - name: test isolated
-        if: ${{ !cancelled() }}
-        run: ./ci/github/unit-testing/webserver.bash test_isolated
-      - name: test
-        if: ${{ !cancelled() }}
-        run: ./ci/github/unit-testing/webserver.bash test_with_db 01
-      - uses: codecov/codecov-action@v5
-        if: ${{ !cancelled() }}
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-        with:
-          flags: unittests #optional
-
+    uses: ./.github/workflows/_reusable-unit-test.yml
+    with:
+      service_name: webserver
+      timeout_minutes: 25
+      dependency_path: "**/web/server/requirements/ci.txt"
+      test_mode: "with_db"
+      test_shard: "01"
+      pre_test_step: "test_isolated"
+    secrets: inherit
 
   unit-test-webserver-02:
     needs: changes