fix: fix oversights in e2e tests

Signed-off-by: Rostislav Lán <[email protected]>

Author: rostalan

.github/workflows/build-extension.yaml

@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2025 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+
+name: build-extension
+
+on:
+  pull_request:
+    branches: [ 'main' ]
+  push:
+    branches: [ 'main' ]
+
+jobs:
+  build-extension:
+    name: Build OCI image
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set image env var
+        id: set-image
+        run: echo "IMAGE=ghcr.io/${{ github.repository_owner }}/podman-desktop-image-checker-openshift-ext:pr-${{ github.event.pull_request.number }}" >> "$GITHUB_ENV"      
+      
+      - name: Build image with podman
+        shell: bash
+        run: |
+          echo "Building image ${IMAGE} with podman"
+          podman build -t "${IMAGE}" -f Containerfile .
+          podman save -m -o podman-desktop-image-checker-openshift-ext.tar "${IMAGE}"
+          echo "${IMAGE}" > podman-desktop-image-checker-openshift-ext.image
+
+      - name: Upload extension oci flatten images
+        uses: actions/upload-artifact@v4
+        with:
+          name: podman-desktop-image-checker-openshift-ext
+          path: podman-desktop-image-checker-openshift-ext*

.github/workflows/build-next.yaml

@@ -18,8 +18,8 @@
 name: CI
 
 on:
-  #push:
-    #branches: [ 'main' ]
+  push:
+    branches: [ 'main' ]
 
 jobs:
   build:

.github/workflows/pr-check.yaml

@@ -18,66 +18,33 @@
 name: pr-check
 
 on:
-  #pull_request:
-   #branches: [ 'main' ]
-  push:
-    branches: [ 'main' ]
+  workflow_run:
+    workflows: 
+      - build-extension
+    types:
+      - completed
 
 jobs:
-  build-extension:
-    name: Build OCI image
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set image env var
-        run: |
-          echo "IMAGE=ghcr.io/${GITHUB_REPOSITORY_OWNER}/podman-desktop-image-checker-openshift-ext:latest" >> $GITHUB_ENV
-     
-      - name: Set up Podman
-        run: |
-          sudo apt-get update -y -qq
-          sudo mkdir -p /etc/apt/keyrings
-          curl -fsSL https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/xUbuntu_$(lsb_release -rs)/Release.key \
-            | gpg --dearmor \
-            | sudo tee /etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg > /dev/null
-          echo \
-            "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg]\
-              https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/xUbuntu_$(lsb_release -rs)/ /" \
-            | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list > /dev/null
-          sudo apt-get update -qq
-          sudo apt-get -qq -y install containernetworking-plugins podman
-
-      - name: Build image with podman
-        shell: bash
-        run: |
-          podman build -t ${IMAGE} -f Containerfile .
-          podman save -m -o podman-desktop-image-checker-openshift-ext.tar ${IMAGE}
-          echo ${IMAGE} > podman-desktop-image-checker-openshift-ext.image
-
-      - name: Upload extension oci flatten images
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
-        with:
-          name: podman-desktop-image-checker-openshift-ext
-          path: podman-desktop-image-checker-openshift-ext*
-
   push-extension:
     name: Push OCI image to ghcr
-    if: github.event_name == 'push'
     runs-on: ubuntu-22.04
-    needs: build-extension
-    permissions:
-      contents: read
-      packages: write
+    if: |
+      github.event.workflow_run.conclusion == 'success'
     steps:
       - name: Download extension oci flatten images
-        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
+        uses: actions/download-artifact@v4
         with:
           name: podman-desktop-image-checker-openshift-ext
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ github.event.workflow_run.id }}
+          
+      - name: Read image name
+        id: read-image
+        run: |
+          echo "IMAGE=$(cat podman-desktop-image-checker-openshift-ext.image)" >> "$GITHUB_ENV"
           
       - name: Log in to ghcr.io
-        uses: redhat-actions/podman-login@4934294ad0449894bcd1e9f191899d7292469603 # v1.7
+        uses: redhat-actions/[email protected]
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -87,16 +54,12 @@ jobs:
         shell: bash
         run: |
           podman load -i podman-desktop-image-checker-openshift-ext.tar
-          podman push ghcr.io/${GITHUB_REPOSITORY_OWNER}/podman-desktop-image-checker-openshift-ext:latest
+          podman push "$IMAGE"
     
   e2e-tests:
     name: Run E2E Tests
     runs-on: ubuntu-22.04
     needs: push-extension
-    permissions:
-      contents: read
-      packages: read
-      actions: write
     steps:
       - name: Checkout the image checker repo
         uses: actions/checkout@v4
@@ -138,3 +101,39 @@ jobs:
           EXTENSION_PREINSTALLED: true
         run: |
           yarn test:e2e
+
+      - name: Publish Test Report
+        uses: mikepenz/action-junit-report@v5
+        if: always()
+        with:
+          annotate_only: true
+          fail_on_failure: true
+          include_passed: true
+          detailed_summary: true
+          require_tests:  true
+          report_paths: '**/*results.xml'
+
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: pr-check
+          path: |
+            ./**/tests/**/output/
+            !./**/*.gguf
+            !./**/*.bin
+            !./**/tests/**/videos/*
+            !./**/tests/**/traces/*
+
+      - name: Upload test videos
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: pr-check-videos
+          path: ./**/tests/playwright/output/videos/*
+
+      - name: Upload test traces
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: pr-check-traces
+          path: ./**/tests/playwright/output/traces/*

podman-desktop-extension/tests/src/image-checker.spec.ts

@@ -34,7 +34,7 @@ const extensionLabel = 'redhat.openshift-checker';
 const extensionLabelName = 'openshift-checker';
 const activeExtensionStatus = 'ACTIVE';
 const disabledExtensionStatus = 'DISABLED';
-const imageToCheck = 'docker.io/library/httpd';
+const imageToCheck = 'ghcr.io/linuxcontainers/alpine';
 const isLinux = process.platform === 'linux';
 const providerName = 'Red Hat OpenShift Checker';
 const extensionName = 'Red Hat OpenShift Checker extension';
@@ -51,7 +51,9 @@ test.beforeAll(async ({ runner, page, welcomePage }) => {
 test.afterAll(async ({ runner, page }) => {
   test.setTimeout(60000);
   try {
-    deleteImage(page, imageToCheck);
+    //deleteImage(page, imageToCheck);
+    // TODO: testing image should be removed after the tests
+    // for some reason this fails
   } finally {
     await runner.close();
   }
@@ -67,7 +69,7 @@ test.describe.serial('Red Hat Image Checker extension installation', () => {
 
   test('Remove old version of the extension', async ({ navigationBar }) => {
     test.skip(!extensionInstalled);
-    await removeExtension(navigationBar);
+    await disableAndRemoveExtension(navigationBar);
   });
 
   test('Extension can be installed from an OCI image', async ({ navigationBar }) => {
@@ -111,7 +113,7 @@ test.describe.serial('Red Hat Image Checker extension functionality', () => {
 
     const pullImagePage = await imagesPage.openPullImage();
     await playExpect(pullImagePage.heading).toBeVisible();
-    imagesPage = await pullImagePage.pullImage(imageToCheck);
+    await pullImagePage.pullImage(imageToCheck);
     const imageDetailsPage = await getImageDetailsPage(navigationBar);
     await playExpect(imageDetailsPage.imageCheckerTab).toBeVisible();
 
@@ -145,7 +147,7 @@ test.describe.serial('Red Hat Image Checker extension functionality', () => {
     await playExpect(imageDetailsPage.imageCheckerTabContent).toBeVisible();
 
     // wait for the analysis to be complete
-    const analysisStatus = await imageDetailsPage.getAnalysisStatus();
+    const analysisStatus = imageDetailsPage.analysisStatus;
     await playExpect(analysisStatus).toBeVisible();
     await playExpect
       .poll(async () => await analysisStatus.innerText(), { timeout: 60000 })
@@ -202,14 +204,15 @@ test.describe.serial('Red Hat Image Checker extension handling', () => {
   });
 
   test('Extension can be removed', async ({ navigationBar }) => {
-    await removeExtension(navigationBar);
+    await disableAndRemoveExtension(navigationBar);
   });
 });
 
-async function removeExtension(navigationBar: NavigationBar): Promise<void> {
+async function disableAndRemoveExtension(navigationBar: NavigationBar): Promise<void> {
   const extensions = await navigationBar.openExtensions();
   const extensionCard = await extensions.getInstalledExtension(extensionLabelName, extensionLabel);
-  await extensionCard.disableExtension();
+  playExpect(extensionCard.status).toHaveText(activeExtensionStatus);
+  await playExpect(extensionCard.removeButton).toBeVisible();
   await extensionCard.removeExtension();
   await playExpect
     .poll(async () => await extensions.extensionIsInstalled(extensionLabel), { timeout: 15000 })