fix

Signed-off-by: Philippe Martin <[email protected]>

Author: feloy

.github/workflows/e2e-tests.yaml

@@ -15,34 +15,74 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-name: pr-check
-
-permissions:
-  contents: read
+name: e2e-tests
 
 on: [pull_request]
 
 jobs:
-  e2e-tests:
-    name: e2e tests
+  # Dedicated step to build the extension image
+  build-container:
+    name: Build Extension Image
     runs-on: ubuntu-24.04
-    strategy:
-      fail-fast: true
     steps:
       - uses: actions/checkout@v6
+      - name: Build Image and Extract Files
+        id: build-image
+        run: |
+          podman build -t local_image -f build/Containerfile ./
+          CONTAINER_ID=$(podman create localhost/local_image --entrypoint "")
+          mkdir -p output/plugins
+          podman export $CONTAINER_ID | tar -x -C output/plugins/
+          podman rm -f $CONTAINER_ID
+          podman rmi -f localhost/local_image:latest
+      - name: Upload Extension Image Artifact
+        uses: actions/upload-artifact@v5
         with:
-          path: kubernetes-dashboard
+          name: extension-plugin
+          path: output/plugins/
 
-      - uses: pnpm/action-setup@v4
-        name: Install pnpm
-        with:
-          run_install: false
-          package_json_file: ./kubernetes-dashboard/package.json
+  e2e-pr-check:
+    name: e2e tests smoke / ${{ matrix.os }}
+    needs: build-container
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ windows-2022, ubuntu-24.04 ]
+    env:
+      SKIP_INSTALLATION: true
+      EXTENSION_PREINSTALLED: true
+      PODMAN_DESKTOP_ARGS: ${{ github.workspace }}/podman-desktop
+      # by default playwright cache browsers binaries in ~/.cache/ms-playwright on Linux and %USERPROFILE%\AppData\Local\ms-playwright on Windows
+      PLAYWRIGHT_BROWSERS_PATH: ${{ github.workspace }}/podman-desktop/pw-browsers
+    steps:
+      - uses: actions/checkout@v6
 
-      - uses: actions/setup-node@v6
-        with:
-          node-version: 22
+      # ==============================================
+      # Installing Podman
+      # ==============================================
+      - name: Install podman to 5.x
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          echo Installing Podman
+          curl --output .\podman-setup.exe  -L https://github.com/containers/podman/releases/download/v5.3.2/podman-5.3.2-setup.exe
+          # Start the installer and wait for it to complete
+          Start-Process -FilePath .\podman-setup.exe -ArgumentList "/install", "/passive", "/norestart", "/log podman-logs.txt" -Wait
+          # Check the logs for debugging purposes
+          Get-Content podman-logs.txt
+
+      # Init Podman Machine
+      - name: Init Podman Machine (Windows)
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          echo "Adding Podman to PATH"
+          $env:PATH += ";C:\Program Files\RedHat\Podman"
+           podman --version
+          podman machine init --now
 
+      # Update Podman linux
       - name: Update podman to 5.x
         if: runner.os == 'Linux'
         run: |
@@ -65,18 +105,6 @@ jobs:
             sudo apt-get -y install podman; }
           podman version
 
-      - name: Set default browser desktop app and handlers
-        run: |
-          xdg-settings set default-web-browser firefox.desktop
-          xdg-mime default firefox.desktop x-scheme-handler/https
-          xdg-mime default firefox.desktop x-scheme-handler/http
-          xvfb-run xdg-open 'https://developers.redhat.com/articles/faqs-no-cost-red-hat-enterprise-linux#general' & sleep 5; pkill Xvfb
-
-      # Install dbus-x11 package to allow dbus session for user for particular display (xvfb-maybe used in e2e test)
-      # for reference, similar issue: https://github.com/actions/runner-images/issues/12127
-      - name: Install dbus-x11 package
-        run: sudo apt-get install dbus-x11
-
       - name: Revert unprivileged user namespace restrictions in Ubuntu 24.04
         if: runner.os == 'Linux'
         run: |
@@ -93,48 +121,86 @@ jobs:
           EOT
           podman info
 
-      - name: Set Chromium policy for Podman Desktop app redirection from browser
+      # ==============================================
+      # Installing Podman Desktop
+      # ==============================================
+      - uses: pnpm/action-setup@v4
+        name: Install pnpm
+        with:
+          run_install: false
+
+      # Install Node.js
+      - uses: actions/setup-node@v6
+        with:
+          node-version: 22
+          cache: 'pnpm'
+
+      # Install npm packages for extension
+      - name: Execute pnpm in Extension
+        run: pnpm install
+
+      # Extract @podman-desktop/api version used (and store to $GITHUB_OUTPUT)
+      - name: Extract @podman-desktop/api version
+        id: pd-api-version
+        shell: bash
         run: |
-          echo '{"URLAllowlist": ["podman-desktop:*"]}' > url_allow_list.json
-          sudo mkdir -p /etc/chromium/policies/managed
-          sudo cp url_allow_list.json /etc/chromium/policies/managed/url_allow_list.json
+          # Using pnpm list to get the resolved version (E.g. getting 1.15.0 when ^1.15.0)
+          export PD_VERSION=$(pnpm list -C packages/extension/ --json | jq -r '.[0].devDependencies."@podman-desktop/api".version')
+          echo "PD_VERSION=$PD_VERSION" >> $GITHUB_OUTPUT
+          echo "Using @podman-desktop/api $PD_VERSION"
+
+      # Check cache for existing podman-desktop
+      - name: Cache Podman Desktop
+        id: cache-pd
+        uses: actions/cache@v4
+        with:
+          path: ${{ github.workspace }}/podman-desktop
+          key: pd-${{ steps.pd-api-version.outputs.PD_VERSION }}-${{ runner.os }}
 
+      # Download Podman Desktop repository based on version defined in package.json
       - name: Download Podman Desktop
+        if: steps.cache-pd.outputs.cache-hit != 'true'
         shell: bash
+        env:
+          PD_VERSION: ${{ steps.pd-api-version.outputs.PD_VERSION }}
         run: |
-          PD_VERSION=1.24.0-202512010926-c9f179c28b7
           echo "Downloading PD desktop to ${{ github.workspace }}/podman-desktop"
-          curl -sL "https://github.com/podman-desktop/testing-prereleases/releases/download/v${PD_VERSION}/podman-desktop-${PD_VERSION}.tar.gz" | tar xvz
+          # Stable release are available podman-desktop/podman-desktop
+          # Prerelease are available under podman-desktop/prereleases
+          if [[ "$PD_VERSION" =~ - ]]; then
+            curl -sL "https://github.com/podman-desktop/prereleases/archive/refs/tags/v$PD_VERSION.tar.gz" | tar xvz
+          else
+            curl -sL "https://github.com/podman-desktop/podman-desktop/archive/refs/tags/v$PD_VERSION.tar.gz" | tar xvz
+          fi
           # Move the extracted folder to the podman-desktop folder
-          mv podman-desktop-${PD_VERSION}/ podman-desktop/
-          echo "PODMAN_DESKTOP_BINARY_PATH=$(pwd)/podman-desktop/podman-desktop" >> $GITHUB_ENV
-
-      - name: Execute pnpm in extension
-        working-directory: ./kubernetes-dashboard
-        run: pnpm install --no-frozen-lockfile
+          mv podman-desktop-$PD_VERSION/ podman-desktop/
 
-      - name: Build Image
-        working-directory: ./kubernetes-dashboard
-        id: build-image
+      # Install and build podman-desktop
+      - name: Install pnpm deps and build Podman Desktop
+        if: steps.cache-pd.outputs.cache-hit != 'true'
+        shell: bash
+        working-directory: ${{ github.workspace }}/podman-desktop
         run: |
-          pnpm build
-          podman build -t local_extension_image -f build/Containerfile ./
-          CONTAINER_ID=$(podman create localhost/local_extension_image --entrypoint "")
-          mkdir -p tests/extension_sources/
-          podman export $CONTAINER_ID | tar -x -C tests/extension_sources/
-          podman rm -f $CONTAINER_ID
-          podman rmi -f localhost/local_extension_image:latest
+          pnpm install
+          pnpm test:e2e:build
 
-      - name: show extension files
-        working-directory: ./kubernetes-dashboard
-        run: |
-          ls -laR tests/extension_sources/
+      # Install the extension
+      - name: Download Extension Plugin
+        uses: actions/download-artifact@v6
+        with:
+          name: extension-plugin
+          path: tests/playwright/tests/playwright/output/kubernetes-dashboard-tests/plugins/
 
-      - name: Execute e2e tests
-        working-directory: ./kubernetes-dashboard/tests/playwright
+      - name: Run E2E Smoke tests
+        shell: bash
+        run: pnpm test:e2e:smoke
         env:
-          PODMAN_DESKTOP_BINARY: ${{ env.PODMAN_DESKTOP_BINARY_PATH }}
-        run: |
-          dbus-launch
-          export $(dbus-launch)
-          pnpm test:e2e
+          NODE_OPTIONS: --no-experimental-strip-types
+
+      - uses: actions/upload-artifact@v5
+        if: always()
+        with:
+          name: e2e-pr-check-${{ matrix.os }}
+          path: |
+            tests/playwright/output/
+            tests/playwright/tests/

package.json

@@ -23,6 +23,8 @@
     "test:webview": "vitest run --project webview --passWithNoTests",
     "test:channels": "vitest run --project channels --passWithNoTests",
     "test": "pnpm run test:extension && pnpm run test:webview && pnpm run test:channels",
+    "test:e2e": "cd tests/playwright && npm run test:e2e",
+    "test:e2e:smoke": "cd tests/playwright && npm run test:e2e:smoke",
     "typecheck:rpc": "tsc --noEmit --project packages/rpc",
     "typecheck:channels": "tsc --noEmit --project packages/channels",
     "typecheck:webview": "tsc --noEmit --project packages/webview",

tests/playwright/package.json

@@ -4,7 +4,8 @@
   "description": "Kubernetes Dashboard extension Playwright E2E tests",
   "scripts": {
     "test:e2e:setup": "xvfb-maybe --auto-servernum --server-args='-screen 0 1280x960x24' --",
-    "test:e2e": "npm run test:e2e:setup playwright test src/"
+    "test:e2e": "npm run test:e2e:setup playwright test src/",
+    "test:e2e:smoke": "npm run test:e2e:setup playwright test src/ --grep @smoke"
   },
   "publisher": "redhat",
   "license": "Apache-2.0",