CONSOLE-5196: Fix Playwright e2e flakes and CI reliability

frontend/e2e/clients/kubernetes-client.ts

@@ -13,7 +13,7 @@ export interface ClusterAuthConfig {
   token?: string;
 }
 
-function isNotFound(err: unknown): boolean {
+export function isNotFound(err: unknown): boolean {
   if (typeof err === 'object' && err !== null) {
     const statusCode = (err as any).statusCode ?? (err as any).response?.statusCode;
     if (statusCode === 404) {
@@ -374,12 +374,10 @@ export default class KubernetesClient {
     const existing = await this.k8sApi.readNamespacedConfigMap({ name, namespace });
     const existingData = (existing as any)?.data || {};
     const mergedData = { ...existingData, ...patchData };
-    await this.k8sApi.patchNamespacedConfigMap({
-      name,
-      namespace,
-      body: { data: mergedData },
-      contentType: k8s.PatchStrategy.MergePatch,
-    } as any);
+    await this.mergePatchResource(
+      `/api/v1/namespaces/${namespace}/configmaps/${name}`,
+      { data: mergedData },
+    );
   }
 
   async createConfigMap(

frontend/e2e/pages/topology-sidebar-page.ts

@@ -11,7 +11,7 @@ export class TopologySidebarPage extends BasePage {
   }
 
   async clickActionsDropdown(): Promise<void> {
-    await this.robustClick(this.actionsDropdown);
+    await this.robustClick(this.actionsDropdown, { timeout: 60_000 });
   }
 
   async selectAction(action: string): Promise<void> {

frontend/e2e/pages/web-terminal-config-page.ts

@@ -35,7 +35,7 @@ export class WebTerminalConfigPage extends BasePage {
 
   async clickWebTerminalTab(): Promise<void> {
     const tab = this.page.getByRole('tab', { name: 'Web Terminal' });
-    await this.robustClick(tab);
+    await this.robustClick(tab, { timeout: 60_000 });
     await this.waitForLoadingComplete(5_000);
   }
 

frontend/e2e/tests/console/app/poll-console-updates.spec.ts

@@ -1,3 +1,4 @@
+import type { Frame, Page, Response, Route } from '@playwright/test';
 import { test, expect } from '../../../fixtures';
 
 const CHECK_UPDATES_URL = '**/api/check-updates';
@@ -19,14 +20,9 @@ const PLUGIN_MANIFEST_DEFAULT = { name: PLUGIN_NAME, version: '0.0.0' };
 const PLUGIN_MANIFEST_DEFAULT2 = { name: PLUGIN_NAME2, version: '0.0.0' };
 const PLUGIN_MANIFEST_NEW_VERSION = { name: PLUGIN_NAME, version: '1.0.0' };
 
-type RouteHandler = (route: import('@playwright/test').Route) => void;
+type RouteHandler = (route: Route) => void;
 
-/**
- * Creates a mutable route handler whose behavior can be swapped at runtime.
- * This avoids Playwright's handler stacking issues (where calling page.route()
- * multiple times on the same URL adds stacked handlers). Instead, we register
- * ONE handler that delegates to a mutable reference.
- */
+// Single handler avoids Playwright's handler stacking when re-routing the same URL.
 function createMutableHandler(initial: RouteHandler) {
   let current = initial;
   const handler: RouteHandler = (route) => current(route);
@@ -36,46 +32,48 @@ function createMutableHandler(initial: RouteHandler) {
   return { handler, setHandler };
 }
 
-/**
- * Navigate to `/` and wait for the PollConsoleUpdates component to initialize.
- *
- * The component uses a prev/current ref pattern: it needs at least 2 poll
- * cycles (~15s apart) before `stateInitialized` becomes true. In CI, OAuth
- * redirects can cause multiple navigations (and component remounts) even
- * after the dashboard appears. Each navigation resets the counter because
- * a remount means the component starts fresh.
- */
-async function navigateAndWaitForInit(page: import('@playwright/test').Page) {
-  await page.goto('/');
-  await expect(page.locator('[data-test-id="dashboard"]').first()).toBeVisible({ timeout: 60_000 });
-
+// PollConsoleUpdates needs 2 poll cycles to initialize; main-frame navs reset the counter.
+async function navigateAndWaitForInit(page: Page) {
   let count = 0;
+  let initResolve: () => void;
+  let initReject: (err: Error) => void;
+  const initPromise = new Promise<void>((resolve, reject) => {
+    initResolve = resolve;
+    initReject = reject;
+  });
 
-  const resetOnNav = () => {
-    count = 0;
+  const resetOnNav = (frame: Frame) => {
+    if (frame === page.mainFrame()) count = 0;
+  };
+  const onResponse = (resp: Response) => {
+    if (resp.url().includes('/api/check-updates') && resp.status() === 200) {
+      count++;
+      if (count >= 2) {
+        page.off('response', onResponse);
+        initResolve();
+      }
+    }
   };
+
   page.on('framenavigated', resetOnNav);
+  page.on('response', onResponse);
+
+  const timer = setTimeout(() => {
+    page.off('response', onResponse);
+    initReject(new Error(`navigateAndWaitForInit: only saw ${count}/2 responses`));
+  }, 90_000);
 
   try {
-    await new Promise<void>((resolve, reject) => {
-      const timer = setTimeout(
-        () => reject(new Error(`navigateAndWaitForInit: only saw ${count}/2 responses`)),
-        90_000,
-      );
-      const handler = (resp: import('@playwright/test').Response) => {
-        if (resp.url().includes('/api/check-updates') && resp.status() === 200) {
-          count++;
-          if (count >= 2) {
-            clearTimeout(timer);
-            page.off('response', handler);
-            resolve();
-          }
-        }
-      };
-      page.on('response', handler);
+    await page.goto('/');
+    await expect(page.locator('[data-test-id="dashboard"]').first()).toBeVisible({
+      timeout: 60_000,
     });
+    await initPromise;
   } finally {
+    clearTimeout(timer);
     page.off('framenavigated', resetOnNav);
+    page.off('response', onResponse);
+    initPromise.catch(() => {});
   }
 }
 

frontend/e2e/tests/console/favorites/favorites.spec.ts

@@ -1,3 +1,4 @@
+import { isNotFound } from '../../../clients/kubernetes-client';
 import { test, expect } from '../../../fixtures';
 
 test.describe('Favorites', { tag: ['@admin'] }, () => {
@@ -11,8 +12,8 @@ test.describe('Favorites', { tag: ['@admin'] }, () => {
           'openshift-console-user-settings',
           { 'console.favorites': '[]', 'console.lastNamespace': '' },
         );
-      } catch {
-        // ConfigMap may not exist yet
+      } catch (e) {
+        if (!isNotFound(e)) throw e;
       }
     });
 
@@ -120,5 +121,16 @@ test.describe('Favorites', { tag: ['@admin'] }, () => {
       await expect(page.getByTestId('favorite-button').first()).toBeDisabled();
     });
 
+    await test.step('Remove all favorites to clean up for future runs', async () => {
+      try {
+        await k8sClient.patchConfigMap(
+          'user-settings-kubeadmin',
+          'openshift-console-user-settings',
+          { 'console.favorites': '[]' },
+        );
+      } catch (e) {
+        if (!isNotFound(e)) throw e;
+      }
+    });
   });
 });

frontend/playwright.config.ts

@@ -50,7 +50,7 @@ export default defineConfig({
   testDir: './e2e/tests',
   testMatch: '**/*.spec.ts',
   forbidOnly: isCI,
-  globalTimeout: parseInt(process.env.GLOBAL_TIMEOUT_MS || '0', 10) || (isCI ? 110 * 60 * 1000 : 0),
+  globalTimeout: Number(process.env.GLOBAL_TIMEOUT_MS) || 0,
   retries: isCI ? 1 : 0,
   timeout: 120_000,
   reporter: isCI
@@ -86,7 +86,7 @@ export default defineConfig({
     },
   },
 
-  workers: process.env.WORKERS ? parseInt(process.env.WORKERS, 10) : undefined,
+  workers: process.env.WORKERS ? Number(process.env.WORKERS) || undefined : undefined,
 
   projects: [
     {

test-prow-playwright-e2e.sh

@@ -48,6 +48,7 @@ export BRIDGE_BASE_ADDRESS="$(oc get consoles.config.openshift.io cluster -o jso
 ./contrib/create-user.sh
 
 export WORKERS="${WORKERS:-2}"
+export GLOBAL_TIMEOUT_MS="${GLOBAL_TIMEOUT_MS:-6600000}"
 
 pushd frontend