rhdh-e2e-test-utils 1.1.7 → 1.1.9

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/dist/utils/plugin-metadata.d.ts

@@ -52,7 +52,7 @@ export declare function getMetadataDirectory(metadataPath?: string): string | nu
  * @param filePath Path to the metadata YAML file
  * @returns PluginMetadata if valid, null otherwise
  */
-export declare function parseMetadataFile(filePath: string): Promise<PluginMetadata | null>;
+export declare function parseMetadataFile(filePath: string): Promise<PluginMetadata>;
 /**
  * Parses all metadata files in a directory and builds a map of plugin name to config.
  * The plugin name is extracted from the dynamicArtifact path for flexible matching.

package/dist/utils/plugin-metadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-metadata.d.ts","sourceRoot":"","sources":["../../src/utils/plugin-metadata.ts"],"names":[],"mappings":"AAuHA;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,2EAA2E;IAC3E,WAAW,EAAE,MAAM,CAAC;IACpB,iEAAiE;IACjE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,sEAAsE;IACtE,WAAW,EAAE,MAAM,CAAC;IACpB,gCAAgC;IAChC,UAAU,EAAE,MAAM,CAAC;CACpB;AAgBD;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,IAAI,OAAO,CAmBpD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAQ5D;AAED;;;GAGG;AACH,eAAO,MAAM,qBAAqB,gBAAgB,CAAC;AAEnD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,GAAE,MAA8B,GAC3C,MAAM,GAAG,IAAI,CAUf;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CA4BhC;AAED;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CA2BtC;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAClC,oBAAoB,EAAE,oBAAoB,EAC1C,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,GACvC,oBAAoB,CAsCtB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,wCAAwC,CAC5D,YAAY,GAAE,MAA8B,GAC3C,OAAO,CAAC,oBAAoB,CAAC,CA0F/B;AAED;;;;;;;;GAQG;AACH,wBAAsB,2BAA2B,CAC/C,oBAAoB,EAAE,oBAAoB,EAC1C,YAAY,GAAE,MAA8B,GAC3C,OAAO,CAAC,oBAAoB,CAAC,CA4B/B"}
+{"version":3,"file":"plugin-metadata.d.ts","sourceRoot":"","sources":["../../src/utils/plugin-metadata.ts"],"names":[],"mappings":"AAuHA;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,2EAA2E;IAC3E,WAAW,EAAE,MAAM,CAAC;IACpB,iEAAiE;IACjE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,sEAAsE;IACtE,WAAW,EAAE,MAAM,CAAC;IACpB,gCAAgC;IAChC,UAAU,EAAE,MAAM,CAAC;CACpB;AAgBD;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,IAAI,OAAO,CAmBpD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAQ5D;AAED;;;GAGG;AACH,eAAO,MAAM,qBAAqB,gBAAgB,CAAC;AAEnD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,GAAE,MAA8B,GAC3C,MAAM,GAAG,IAAI,CAUf;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,CAAC,CA0BzB;AAED;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAwBtC;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AA4CD;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAClC,oBAAoB,EAAE,oBAAoB,EAC1C,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,GACvC,oBAAoB,CAsCtB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,wCAAwC,CAC5D,YAAY,GAAE,MAA8B,GAC3C,OAAO,CAAC,oBAAoB,CAAC,CAsD/B;AAED;;;;;;;;GAQG;AACH,wBAAsB,2BAA2B,CAC/C,oBAAoB,EAAE,oBAAoB,EAC1C,YAAY,GAAE,MAA8B,GAC3C,OAAO,CAAC,oBAAoB,CAAC,CAuC/B"}

package/dist/utils/plugin-metadata.js

@@ -142,28 +142,23 @@ export function getMetadataDirectory(metadataPath = DEFAULT_METADATA_PATH) {
  * @returns PluginMetadata if valid, null otherwise
  */
 export async function parseMetadataFile(filePath) {
-    try {
-        const content = await fs.readFile(filePath, "utf8");
-        const parsed = yaml.load(content);
-        const packagePath = parsed?.spec?.dynamicArtifact;
-        const packageName = parsed?.spec?.packageName;
-        const pluginConfig = parsed?.spec?.appConfigExamples?.[0]?.content;
-        if (!packagePath) {
-            console.log(`[PluginMetadata] Skipping ${filePath}: no spec.dynamicArtifact`);
-            return null;
-        }
-        console.log(`[PluginMetadata] Loaded metadata for: ${packagePath}`);
-        return {
-            packagePath,
-            pluginConfig: pluginConfig || {},
-            packageName: packageName || "",
-            sourceFile: filePath,
-        };
+    const content = await fs.readFile(filePath, "utf8");
+    const parsed = yaml.load(content);
+    const packagePath = parsed?.spec?.dynamicArtifact;
+    const packageName = parsed?.spec?.packageName;
+    const pluginConfig = parsed?.spec?.appConfigExamples?.[0]?.content;
+    if (!packagePath) {
+        throw new Error(`[PluginMetadata] Missing required field spec.dynamicArtifact in ${filePath}`);
     }
-    catch (error) {
-        console.error(`[PluginMetadata] Error parsing ${filePath}:`, error);
-        return null;
+    if (!packageName) {
+        throw new Error(`[PluginMetadata] Missing required field spec.packageName in ${filePath}`);
     }
+    return {
+        packagePath,
+        pluginConfig: pluginConfig || {},
+        packageName,
+        sourceFile: filePath,
+    };
 }
 /**
  * Parses all metadata files in a directory and builds a map of plugin name to config.
@@ -179,16 +174,46 @@ export async function parseAllMetadataFiles(metadataDir) {
     const metadataMap = new Map();
     for (const file of files) {
         const metadata = await parseMetadataFile(file);
-        if (metadata) {
-            // Use extracted plugin name as key for flexible matching
-            const pluginName = extractPluginName(metadata.packagePath);
-            metadataMap.set(pluginName, metadata);
-            console.log(`[PluginMetadata] Mapped plugin: ${pluginName} <- ${metadata.packagePath}`);
-        }
+        const pluginName = extractPluginName(metadata.packagePath);
+        metadataMap.set(pluginName, metadata);
+        console.log(`[PluginMetadata] Mapped plugin: ${pluginName} <- ${metadata.packagePath}`);
     }
     console.log(`[PluginMetadata] Successfully parsed ${metadataMap.size} plugin metadata entries`);
     return metadataMap;
 }
+/**
+ * Replaces local package paths with OCI URLs for plugins that have matching metadata.
+ * Only applies to plugins with metadata (workspace plugins). Plugins without metadata
+ * (e.g., keycloak, bulk-import from auth defaults) keep their original paths.
+ *
+ * @param plugins The plugin entries to process
+ * @param metadataMap Map of plugin names to plugin metadata
+ * @param metadataPath Path to the metadata directory (used to resolve workspace root)
+ * @returns Plugin entries with OCI URLs replaced where applicable
+ */
+async function replaceWithOCIUrls(plugins, metadataMap, metadataPath) {
+    const prNumber = process.env.GIT_PR_NUMBER;
+    if (!prNumber) {
+        return plugins;
+    }
+    console.log(`[PluginMetadata] PR build detected (PR #${prNumber}), fetching OCI URLs...`);
+    const workspacePath = path.resolve(metadataPath, "..");
+    const ociUrls = await getOCIUrlsForPR(workspacePath, prNumber);
+    return plugins.map((plugin) => {
+        const pluginName = extractPluginName(plugin.package);
+        const metadata = metadataMap.get(pluginName);
+        if (!metadata?.packageName)
+            return plugin;
+        const displayName = metadata.packageName
+            .replace(/^@/, "")
+            .replace(/\//g, "-");
+        const ociUrl = ociUrls.get(displayName);
+        if (!ociUrl)
+            return plugin;
+        console.log(`[PluginMetadata] Replacing ${plugin.package} with ${ociUrl}`);
+        return { ...plugin, package: ociUrl };
+    });
+}
 /**
  * Injects plugin configurations from metadata into a dynamic plugins config.
  * Metadata config serves as the base, user-provided pluginConfig overrides it.
@@ -255,43 +280,18 @@ export async function generateDynamicPluginsConfigFromMetadata(metadataPath = DE
     if (metadataMap.size === 0) {
         throw new Error(`[PluginMetadata] Cannot generate dynamic-plugins config: no valid metadata files found in ${metadataDir}`);
     }
-    // If PR number is set, fetch OCI URLs
-    const prNumber = process.env.GIT_PR_NUMBER;
-    let ociUrls = null;
-    if (prNumber) {
-        console.log(`[PluginMetadata] PR build detected (PR #${prNumber}), fetching OCI URLs...`);
-        const workspacePath = path.resolve(metadataPath, "..");
-        ociUrls = await getOCIUrlsForPR(workspacePath, prNumber);
-    }
     // Build plugin entries from metadata
-    const plugins = [];
+    let plugins = [];
     for (const [pluginName, metadata] of metadataMap) {
-        let packageRef = metadata.packagePath;
-        // Replace with OCI URL if available (required for PR builds)
-        if (ociUrls) {
-            if (!metadata.packageName) {
-                throw new Error(`[PluginMetadata] PR build requires packageName in metadata but not found for: ${pluginName}\n` +
-                    `  Source file: ${metadata.sourceFile}`);
-            }
-            const displayName = metadata.packageName
-                .replace(/^@/, "")
-                .replace(/\//g, "-");
-            const ociUrl = ociUrls.get(displayName);
-            if (!ociUrl) {
-                throw new Error(`[PluginMetadata] PR build requires OCI URL but not found for: ${displayName}\n` +
-                    `  Package name: ${metadata.packageName}\n` +
-                    `  Source file: ${metadata.sourceFile}`);
-            }
-            console.log(`[PluginMetadata] Replacing ${packageRef} with ${ociUrl}`);
-            packageRef = ociUrl;
-        }
-        console.log(`[PluginMetadata] Adding plugin: ${pluginName} (${packageRef})`);
+        console.log(`[PluginMetadata] Adding plugin: ${pluginName} (${metadata.packagePath})`);
         plugins.push({
-            package: packageRef,
+            package: metadata.packagePath,
             disabled: false,
             pluginConfig: metadata.pluginConfig,
         });
     }
+    // Replace local paths with OCI URLs for PR builds
+    plugins = await replaceWithOCIUrls(plugins, metadataMap, metadataPath);
     console.log(`[PluginMetadata] Generated dynamic-plugins config with ${plugins.length} plugins`);
     return { plugins };
 }
@@ -321,5 +321,10 @@ export async function loadAndInjectPluginMetadata(dynamicPluginsConfig, metadata
         throw new Error(`[PluginMetadata] PR build requires plugin metadata but no valid metadata files found in ${metadataDir}`);
     }
     // Inject metadata configs into the dynamic plugins config
-    return injectMetadataConfig(dynamicPluginsConfig, metadataMap);
+    const result = injectMetadataConfig(dynamicPluginsConfig, metadataMap);
+    // Replace local paths with OCI URLs for PR builds
+    if (result.plugins) {
+        result.plugins = await replaceWithOCIUrls(result.plugins, metadataMap, metadataPath);
+    }
+    return result;
 }

package/package.json

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