rhdh-e2e-test-utils 1.1.7 → 1.1.8

package/dist/deployment/keycloak/deployment.js

@@ -293,7 +293,7 @@ export class KeycloakHelper {
     /**
      * Wait for Keycloak to be ready
      */
-    async waitUntilReady(timeout = 300) {
+    async waitUntilReady(timeout = 500) {
         this._log(`Waiting for Keycloak to be ready...`);
         const labelSelector = `app.kubernetes.io/instance=${this.deploymentConfig.releaseName}`;
         await this.k8sClient.waitForPodsWithFailureDetection(this.deploymentConfig.namespace, labelSelector, timeout);
@@ -343,14 +343,14 @@ spec:
     }
     async _waitForKeycloak() {
         this._log("Waiting for Keycloak API to be ready...");
-        const timeout = 300;
+        const timeout = 500;
         const startTime = Date.now();
         while (true) {
             if (await this.isRunning()) {
                 break;
             }
             if ((Date.now() - startTime) / 1000 >= timeout) {
-                throw new Error("Keycloak API not ready after 5 minutes");
+                throw new Error(`Keycloak API not ready after ${timeout} seconds`);
             }
             await new Promise((resolve) => setTimeout(resolve, 5000));
             this._log("  Waiting for Keycloak API to be ready...");

package/dist/deployment/rhdh/deployment.js

@@ -21,7 +21,7 @@ export class RHDHDeployment {
     }
     async deploy() {
         this._log("Starting RHDH deployment...");
-        test.setTimeout(500_000);
+        test.setTimeout(600_000);
         await this.k8sClient.createNamespaceIfNotExists(this.deploymentConfig.namespace);
         await this._applyAppConfig();
         await this._applySecrets();
@@ -173,7 +173,7 @@ export class RHDHDeployment {
         await $ `oc wait --for=delete pod -l 'app.kubernetes.io/instance in (redhat-developer-hub,developer-hub),app.kubernetes.io/name!=postgresql' -n ${namespace} --timeout=120s || true`;
         await $ `oc scale deployment -l 'app.kubernetes.io/instance in (redhat-developer-hub,developer-hub)' --replicas=1 -n ${namespace}`;
     }
-    async waitUntilReady(timeout = 300) {
+    async waitUntilReady(timeout = 500) {
         this._log(`Waiting for RHDH deployment to be ready in namespace ${this.deploymentConfig.namespace}...`);
         const labelSelector = "app.kubernetes.io/instance in (redhat-developer-hub,developer-hub)";
         try {

package/dist/playwright/base-config.js

@@ -7,7 +7,7 @@ import { resolve } from "path";
 export const baseConfig = {
     testDir: "./tests",
     forbidOnly: !!process.env.CI,
-    retries: process.env.CI ? 2 : 0,
+    retries: process.env.CI ? 1 : 0,
     workers: "50%",
     outputDir: "node_modules/.cache/e2e-test-results",
     timeout: 90_000,

package/dist/utils/kubernetes-client.d.ts

@@ -37,9 +37,18 @@ declare class KubernetesClientHelper {
         stringData?: Record<string, string>;
     }, namespace: string): Promise<void>;
     /**
-     * Delete a namespace
+     * Delete a namespace and wait for it to be fully terminated
      */
-    deleteNamespace(namespace: string): Promise<void>;
+    deleteNamespace(namespace: string, waitForDeletion?: boolean, timeoutSeconds?: number): Promise<void>;
+    /**
+     * Wait for a namespace to be fully deleted
+     */
+    private _waitForNamespaceDeletion;
+    /**
+     * Check if an error is a "not found" (404) error.
+     * Handles different error formats from various k8s client versions.
+     */
+    private _isNotFoundError;
     /**
      * Check if a StatefulSet is ready (all replicas are available)
      */

package/dist/utils/kubernetes-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kubernetes-client.d.ts","sourceRoot":"","sources":["../../src/utils/kubernetes-client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,yBAAyB,CAAC;AAO/C;;GAEG;AACH,cAAM,sBAAsB;IAC1B,OAAO,CAAC,GAAG,CAAiB;IAC5B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,QAAQ,CAAgB;IAChC,OAAO,CAAC,iBAAiB,CAAuB;;IAoChD;;OAEG;IACG,uBAAuB,CAC3B,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,EACtB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;IA8C3B;;OAEG;IACG,0BAA0B,CAC9B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;IA+B3B;;UAEM;IAmBN;;OAEG;IAsBH;;OAEG;YACW,YAAY;IA8B1B;;OAEG;IACG,wBAAwB,CAC5B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC;IA0ChB;;OAEG;IACG,qBAAqB,CACzB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,EAC7C,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC;IAqChB;;OAEG;IACG,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BvD;;OAEG;IACG,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAc3E;;OAEG;IACG,uBAAuB,CAC3B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,cAAc,GAAE,MAAY,EAC5B,cAAc,GAAE,MAAa,GAC5B,OAAO,CAAC,OAAO,CAAC;IAiBnB;;;OAGG;IACG,uBAAuB,IAAI,OAAO,CAAC,MAAM,CAAC;IAsBhD;;;;;;OAMG;IACG,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAkBxE;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAmBxB;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAQnC;IAEH;;;;;;;;OAQG;IACG,+BAA+B,CACnC,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,cAAc,GAAE,MAAY,EAC5B,cAAc,GAAE,MAAa,GAC5B,OAAO,CAAC,IAAI,CAAC;IAiEhB;;OAEG;IACH,OAAO,CAAC,gBAAgB;CA8BzB;AAED,OAAO,EAAE,sBAAsB,EAAE,CAAC"}
+{"version":3,"file":"kubernetes-client.d.ts","sourceRoot":"","sources":["../../src/utils/kubernetes-client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,yBAAyB,CAAC;AAO/C;;GAEG;AACH,cAAM,sBAAsB;IAC1B,OAAO,CAAC,GAAG,CAAiB;IAC5B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,QAAQ,CAAgB;IAChC,OAAO,CAAC,iBAAiB,CAAuB;;IAoChD;;OAEG;IACG,uBAAuB,CAC3B,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,EACtB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;IA8C3B;;OAEG;IACG,0BAA0B,CAC9B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;IA+B3B;;UAEM;IAmBN;;OAEG;IAsBH;;OAEG;YACW,YAAY;IA8B1B;;OAEG;IACG,wBAAwB,CAC5B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC;IA0ChB;;OAEG;IACG,qBAAqB,CACzB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,EAC7C,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC;IAqChB;;OAEG;IACG,eAAe,CACnB,SAAS,EAAE,MAAM,EACjB,eAAe,GAAE,OAAc,EAC/B,cAAc,GAAE,MAAY,GAC3B,OAAO,CAAC,IAAI,CAAC;IAyBhB;;OAEG;YACW,yBAAyB;IAsCvC;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IA2BxB;;OAEG;IACG,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAc3E;;OAEG;IACG,uBAAuB,CAC3B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,cAAc,GAAE,MAAY,EAC5B,cAAc,GAAE,MAAa,GAC5B,OAAO,CAAC,OAAO,CAAC;IAiBnB;;;OAGG;IACG,uBAAuB,IAAI,OAAO,CAAC,MAAM,CAAC;IAsBhD;;;;;;OAMG;IACG,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAkBxE;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAmBxB;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAQnC;IAEH;;;;;;;;OAQG;IACG,+BAA+B,CACnC,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,cAAc,GAAE,MAAY,EAC5B,cAAc,GAAE,MAAa,GAC5B,OAAO,CAAC,IAAI,CAAC;IA8FhB;;OAEG;IACH,OAAO,CAAC,gBAAgB;CA8BzB;AAED,OAAO,EAAE,sBAAsB,EAAE,CAAC"}

package/dist/utils/kubernetes-client.js

@@ -265,26 +265,80 @@ class KubernetesClientHelper {
         }
     }
     /**
-     * Delete a namespace
+     * Delete a namespace and wait for it to be fully terminated
      */
-    async deleteNamespace(namespace) {
+    async deleteNamespace(namespace, waitForDeletion = true, timeoutSeconds = 180) {
         try {
             await this._k8sApi.deleteNamespace({ name: namespace });
-            console.log(`✓ Deleted namespace ${namespace}`);
+            console.log(`[K8sHelper] Deleting namespace ${namespace}...`);
         }
         catch (error) {
             // Ignore if namespace doesn't exist (already deleted), but throw other errors
-            const err = error;
-            if (err.body?.code === 404 ||
-                err.response?.statusCode === 404 ||
-                err.statusCode === 404) {
+            if (this._isNotFoundError(error)) {
                 console.log(`✓ Namespace ${namespace} already deleted or doesn't exist`);
+                return;
             }
             else {
                 console.error(`✗ Failed to delete namespace ${namespace}:`, error instanceof Error ? error.message : error);
                 throw error;
             }
         }
+        if (waitForDeletion) {
+            await this._waitForNamespaceDeletion(namespace, timeoutSeconds);
+        }
+    }
+    /**
+     * Wait for a namespace to be fully deleted
+     */
+    async _waitForNamespaceDeletion(namespace, timeoutSeconds = 180) {
+        const startTime = Date.now();
+        const timeoutMs = timeoutSeconds * 1000;
+        const pollIntervalMs = 3000;
+        while (Date.now() - startTime < timeoutMs) {
+            try {
+                const ns = await this._k8sApi.readNamespace({ name: namespace });
+                const phase = ns.status?.phase;
+                // Namespace still exists, wait and retry
+                if (phase === "Terminating") {
+                    // Only log occasionally to avoid spam
+                    const elapsed = Math.round((Date.now() - startTime) / 1000);
+                    if (elapsed % 10 === 0) {
+                        console.log(`[K8sHelper] Namespace ${namespace} still terminating (${elapsed}s)...`);
+                    }
+                }
+                await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
+            }
+            catch (error) {
+                // Check for 404 in various error formats from different k8s client versions
+                if (this._isNotFoundError(error)) {
+                    console.log(`✓ Namespace ${namespace} fully deleted`);
+                    return;
+                }
+                throw error;
+            }
+        }
+        throw new Error(`Timeout waiting for namespace ${namespace} to be deleted after ${timeoutSeconds}s`);
+    }
+    /**
+     * Check if an error is a "not found" (404) error.
+     * Handles different error formats from various k8s client versions.
+     */
+    _isNotFoundError(error) {
+        if (!error)
+            return false;
+        // Check error message for "404" or "not found"
+        if (error instanceof Error) {
+            const msg = error.message.toLowerCase();
+            if (msg.includes("404") || msg.includes("not found")) {
+                return true;
+            }
+        }
+        // Check various object properties for 404 status codes
+        const err = error;
+        return (err.body?.code === 404 ||
+            err.response?.statusCode === 404 ||
+            err.statusCode === 404 ||
+            err.code === 404);
     }
     /**
      * Check if a StatefulSet is ready (all replicas are available)
@@ -397,7 +451,7 @@ class KubernetesClientHelper {
      * @param timeoutSeconds - Maximum time to wait (default: 300)
      * @param pollIntervalMs - How often to check pod status (default: 5000)
      */
-    async waitForPodsWithFailureDetection(namespace, labelSelector, timeoutSeconds = 300, pollIntervalMs = 5000) {
+    async waitForPodsWithFailureDetection(namespace, labelSelector, timeoutSeconds = 500, pollIntervalMs = 5000) {
         const startTime = Date.now();
         const timeoutMs = timeoutSeconds * 1000;
         console.log(`[K8sHelper] Waiting for pods (${labelSelector}) in ${namespace}...`);
@@ -443,8 +497,34 @@ class KubernetesClientHelper {
                 console.log(`[K8sHelper] All ${pods.length} pod(s) ready in ${namespace}`);
                 return;
             }
+            // Log pod status every 20 seconds
+            const elapsedSec = Math.floor((Date.now() - startTime) / 1000);
+            if (elapsedSec > 0 && elapsedSec % 20 === 0) {
+                try {
+                    await $ `oc get pods -n ${namespace} -l ${labelSelector}`;
+                }
+                catch {
+                    // Ignore errors
+                }
+            }
             await new Promise((r) => setTimeout(r, pollIntervalMs));
         }
+        // Timeout reached - collect diagnostic info before throwing
+        console.log(`\n[K8sHelper] ═══ Pod Diagnostics (timeout reached) ═══`);
+        try {
+            console.log(`\n[K8sHelper] ─── Pod Status ───`);
+            await $ `oc get pods -n ${namespace} -l ${labelSelector} -o wide`;
+            console.log(`\n[K8sHelper] ─── Pod Details ───`);
+            await $ `oc describe pods -n ${namespace} -l ${labelSelector}`;
+            console.log(`\n[K8sHelper] ─── Namespace Events ───`);
+            await $ `oc get events -n ${namespace} --sort-by='.lastTimestamp'`;
+            console.log(`\n[K8sHelper] ─── Pod Logs ───`);
+            await $ `oc logs -n ${namespace} -l ${labelSelector} --all-containers --tail=100 2>&1 || true`;
+        }
+        catch {
+            // Ignore errors from diagnostic commands
+        }
+        console.log(`\n[K8sHelper] ═══ End Pod Diagnostics ═══\n`);
         throw new Error(`Timeout waiting for pods (${labelSelector}) after ${timeoutSeconds}s`);
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rhdh-e2e-test-utils",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "Test utilities for RHDH E2E tests",
   "license": "Apache-2.0",
   "type": "module",