vibe

Author: sanderegg

.github/workflows/_reusable-system-tests.yml

@@ -43,51 +43,28 @@ on:
 jobs:
   system-test-public-api:
     if: ${{ inputs.run-public-api }}
-    timeout-minutes: 25 # if this timeout gets too small, then split the tests
+    timeout-minutes: 25
     name: "[sys] public api"
     runs-on: ${{ inputs.os }}
     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
+      - uses: ./.github/workflows/actions/common-setup
         with:
           python-version: ${{ inputs.python-version }}
-      - name: expose github runtime for buildx
-        uses: crazy-max/ghaction-github-runtime@v3
-      # FIXME: Workaround for https://github.com/actions/download-artifact/issues/249
-      - name: download docker images with retry
-        uses: Wandalen/wretry.action@master
-        with:
-          action: actions/download-artifact@v4
-          with: |
-            pattern: docker-buildx-images-${{ runner.os }}-${{ github.sha }}-*
-            path: /${{ runner.temp }}/build
-          attempt_limit: 5
-          attempt_delay: 1000
-
-      - name: install uv
-        uses: astral-sh/setup-uv@v6
-        with:
-          version: ${{ inputs.uv-version }}
-          enable-cache: false
-          cache-dependency-glob: "**/public-api/requirements/ci.txt"
+          uv-version: ${{ inputs.uv-version }}
+          requirements-path: "**/public-api/requirements/ci.txt"
+          runner-temp: ${{ runner.temp }}
       - name: load docker images
-        run: make load-images local-src=/${{ runner.temp }}/build
+        run: make load-images local-src=${{ runner.temp }}/build
       - name: show system version
         run: ./ci/helpers/show_system_versions.bash
-      - name: install
+      - name: install & test
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./ci/github/system-testing/public-api.bash install
-      - name: test
-        run: ./ci/github/system-testing/public-api.bash test
+        run: |
+          ./ci/github/system-testing/public-api.bash install
+          ./ci/github/system-testing/public-api.bash test
       - name: upload failed tests logs
-        if: ${{ failure() }}
+        if: failure()
         uses: actions/upload-artifact@v4
         with:
           name: ${{ github.job }}_docker_logs
@@ -98,55 +75,36 @@ jobs:
 
   system-test-swarm-deploy:
     if: ${{ inputs.run-swarm-deploy }}
-    timeout-minutes: 30 # if this timeout gets too small, then split the tests
+    timeout-minutes: 30
     name: "[sys] deploy simcore"
     runs-on: ${{ inputs.os }}
     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
+      - uses: ./.github/workflows/actions/common-setup
         with:
           python-version: ${{ inputs.python-version }}
-      - name: expose github runtime for buildx
-        uses: crazy-max/ghaction-github-runtime@v3
-      # FIXME: Workaround for https://github.com/actions/download-artifact/issues/249
-      - name: download docker images with retry
-        uses: Wandalen/wretry.action@master
-        with:
-          action: actions/download-artifact@v4
-          with: |
-            pattern: docker-buildx-images-${{ runner.os }}-${{ github.sha }}-*
-            path: /${{ runner.temp }}/build
-          attempt_limit: 5
-          attempt_delay: 1000
-      - name: install uv
-        uses: astral-sh/setup-uv@v6
-        with:
-          version: "0.6.x"
-          enable-cache: false
-          cache-dependency-glob: "**/swarm-deploy/requirements/ci.txt"
+          uv-version: ${{ inputs.uv-version }}
+          requirements-path: "**/swarm-deploy/requirements/ci.txt"
+          runner-temp: ${{ runner.temp }}
       - name: load docker images
-        run: make load-images local-src=/${{ runner.temp }}/build
+        run: make load-images local-src=${{ runner.temp }}/build
       - name: show system version
         run: ./ci/helpers/show_system_versions.bash
-      - name: install
-        run: ./ci/github/system-testing/swarm-deploy.bash install
-      - name: test
-        run: ./ci/github/system-testing/swarm-deploy.bash test
-      - name: dump services setting schemas
-        run: export DOCKER_REGISTRY=local; export DOCKER_IMAGE_TAG=production; make settings-schema.json
+      - name: install & test
+        run: |
+          ./ci/github/system-testing/swarm-deploy.bash install
+          ./ci/github/system-testing/swarm-deploy.bash test
+      - name: dump services settings schemas
+        run: |
+          export DOCKER_REGISTRY=local
+          export DOCKER_IMAGE_TAG=production
+          make settings-schema.json
       - name: upload services settings schemas
         uses: actions/upload-artifact@v4
         with:
           name: ${{ github.job }}_services_settings_schemas
           path: ./services/**/settings-schema.json
       - name: upload failed tests logs
-        if: ${{ failure() }}
+        if: failure()
         uses: actions/upload-artifact@v4
         with:
           name: ${{ github.job }}_docker_logs
@@ -157,159 +115,109 @@ jobs:
 
   system-test-e2e:
     if: ${{ inputs.run-e2e }}
-    timeout-minutes: 30 # if this timeout gets too small, then split the tests
+    timeout-minutes: 30
     name: "[sys] e2e"
     runs-on: ${{ inputs.os }}
     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
+      - uses: ./.github/workflows/actions/common-setup
         with:
           python-version: ${{ inputs.python-version }}
+          uv-version: ${{ inputs.uv-version }}
+          requirements-path: "**/e2e/requirements/requirements.txt"
+          runner-temp: ${{ runner.temp }}
       - uses: actions/[email protected]
         with:
           node-version: ${{ inputs.node-version }}
           cache: "npm"
           cache-dependency-path: "tests/e2e/package-lock.json"
-      - name: expose github runtime for buildx
-        uses: crazy-max/ghaction-github-runtime@v3
-      # FIXME: Workaround for https://github.com/actions/download-artifact/issues/249
-      - name: download docker images with retry
-        uses: Wandalen/wretry.action@master
-        with:
-          action: actions/download-artifact@v4
-          with: |
-            pattern: docker-buildx-images-${{ runner.os }}-${{ github.sha }}-*
-            path: /${{ runner.temp }}/build
-          attempt_limit: 5
-          attempt_delay: 1000
-      - name: install uv
-        uses: astral-sh/setup-uv@v6
-        with:
-          version: ${{ inputs.uv-version }}
-          enable-cache: false
-          cache-dependency-glob: "**/e2e/requirements/requirements.txt"
       - name: load docker images
-        run: make load-images local-src=/${{ runner.temp }}/build
+        run: make load-images local-src=${{ runner.temp }}/build
       - name: show system version
         run: ./ci/helpers/show_system_versions.bash
-      - name: setup
-        run: ./ci/github/system-testing/e2e.bash install
-      - name: test
-        run: ./ci/github/system-testing/e2e.bash test
-      - name: dump docker logs
-        if: ${{ !cancelled() }}
-        run: ./ci/github/system-testing/e2e.bash dump_docker_logs
-      - name: upload docker logs
-        if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ github.job }}_docker_logs
-          path: ./tests/e2e/test_failures
-      - name: upload screenshots
+      - name: install & test
+        run: |
+          ./ci/github/system-testing/e2e.bash install
+          ./ci/github/system-testing/e2e.bash test
+      - name: collect artifacts
         if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ github.job }}_screenshots
-          path: tests/e2e/screenshots
-      - name: upload e2e logs
+        run: |
+          ./ci/github/system-testing/e2e.bash dump_docker_logs
+          for artifact in docker_logs screenshots logs; do
+            if [ -d "./tests/e2e/${artifact}" ]; then
+              tar -czf "${artifact}.tar.gz" "./tests/e2e/${artifact}"
+            fi
+          done
+      - name: upload artifacts
         if: ${{ !cancelled() }}
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ github.job }}_logs
-          path: tests/e2e/logs
+          name: ${{ github.job }}_artifacts
+          path: |
+            docker_logs.tar.gz
+            screenshots.tar.gz
+            logs.tar.gz
       - name: cleanup
         if: ${{ !cancelled() }}
         run: ./ci/github/system-testing/e2e.bash clean_up
 
   system-test-e2e-playwright:
     if: ${{ inputs.run-e2e-playwright }}
-    timeout-minutes: 30 # if this timeout gets too small, then split the tests
+    timeout-minutes: 30
     name: "[sys] e2e-playwright"
     runs-on: ${{ inputs.os }}
     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
+      - uses: ./.github/workflows/actions/common-setup
         with:
           python-version: ${{ inputs.python-version }}
-      - name: install uv
-        uses: astral-sh/setup-uv@v6
-        with:
-          version: ${{ inputs.uv-version }}
-          enable-cache: false
-          cache-dependency-glob: "**/e2e-playwright/requirements/ci.txt"
-      - name: expose github runtime for buildx
-        uses: crazy-max/ghaction-github-runtime@v3
-      - name: download docker images
-        uses: actions/download-artifact@v4
-        with:
-          pattern: docker-buildx-images-${{ runner.os }}-${{ github.sha }}-*
-          path: /${{ runner.temp }}/build
+          uv-version: ${{ inputs.uv-version }}
+          requirements-path: "**/e2e-playwright/requirements/ci.txt"
+          runner-temp: ${{ runner.temp }}
       - name: load docker images
-        run: make load-images local-src=/${{ runner.temp }}/build
+        run: make load-images local-src=${{ runner.temp }}/build
       - name: prepare devenv
         run: make devenv
       - name: show system version
         run: ./ci/helpers/show_system_versions.bash
-      - name: setup
-        run: ./ci/github/system-testing/e2e-playwright.bash install
-      - name: test
-        run: ./ci/github/system-testing/e2e-playwright.bash test
-      - name: dump docker logs
+      - name: install & test
+        run: |
+          ./ci/github/system-testing/e2e-playwright.bash install
+          ./ci/github/system-testing/e2e-playwright.bash test
+      - name: collect artifacts
         if: ${{ !cancelled() }}
-        run: ./ci/github/system-testing/e2e-playwright.bash dump_docker_logs
-      - name: upload docker logs
+        run: |
+          ./ci/github/system-testing/e2e-playwright.bash dump_docker_logs
+          for dir in test_failures test-results; do
+            if [ -d "./tests/e2e-playwright/${dir}" ]; then
+              tar -czf "${dir}.tar.gz" "./tests/e2e-playwright/${dir}"
+            fi
+          done
+      - name: upload artifacts
         if: ${{ !cancelled() }}
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ github.job }}_docker_logs
-          path: ./tests/e2e-playwright/test_failures
-      - name: upload tracing if failed
-        if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ github.job }}_tracing
-          path: tests/e2e-playwright/test-results
+          name: ${{ github.job }}_artifacts
+          path: |
+            test_failures.tar.gz
+            test-results.tar.gz
 
   system-test-environment-setup:
     if: ${{ inputs.run-environment-setup }}
-    timeout-minutes: 30 # if this timeout gets too small, then split the tests
+    timeout-minutes: 30
     name: "[sys] environment setup"
     runs-on: ${{ inputs.os }}
     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
+      - uses: ./.github/workflows/actions/common-setup
         with:
           python-version: ${{ inputs.python-version }}
-      - name: install uv
-        uses: astral-sh/setup-uv@v6
-        with:
-          version: ${{ inputs.uv-version }}
-          enable-cache: false
-          cache-dependency-glob: "**/environment-setup/requirements/ci.txt"
+          uv-version: ${{ inputs.uv-version }}
+          requirements-path: "**/environment-setup/requirements/ci.txt"
+          runner-temp: ${{ runner.temp }}
       - name: show system version
         run: ./ci/helpers/show_system_versions.bash
-      - name: install
-        run: ./ci/github/system-testing/environment-setup.bash install
-      - name: test
-        run: ./ci/github/system-testing/environment-setup.bash test
+      - name: install & test
+        run: |
+          ./ci/github/system-testing/environment-setup.bash install
+          ./ci/github/system-testing/environment-setup.bash test
       - name: cleanup
         if: ${{ !cancelled() }}
         run: ./ci/github/system-testing/environment-setup.bash clean_up

.github/workflows/actions/common-setup/action.yml

@@ -0,0 +1,46 @@
+name: Common Setup
+description: Common setup steps for system tests
+
+inputs:
+  python-version:
+    required: true
+    description: "Python version to use"
+  uv-version:
+    required: true
+    description: "UV version to use"
+  requirements-path:
+    required: true
+    description: "Path to requirements file for UV cache"
+  runner-temp:
+    required: true
+    description: "Path to runner temp directory"
+
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/checkout@v4
+    - name: setup docker buildx
+      uses: docker/setup-buildx-action@v3
+      with:
+        driver: docker-container
+    - name: setup python
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ inputs.python-version }}
+    - name: expose github runtime
+      uses: crazy-max/ghaction-github-runtime@v3
+    - name: download docker images
+      uses: Wandalen/wretry.action@master
+      with:
+        action: actions/download-artifact@v4
+        with: |
+          pattern: docker-buildx-images-${{ runner.os }}-${{ github.sha }}-*
+          path: ${{ inputs.runner-temp }}/build
+        attempt_limit: 5
+        attempt_delay: 1000
+    - name: install uv
+      uses: astral-sh/setup-uv@v6
+      with:
+        version: ${{ inputs.uv-version }}
+        enable-cache: false
+        cache-dependency-glob: ${{ inputs.requirements-path }}