rhdh-e2e-test-utils 1.1.4 → 1.1.6

package/dist/deployment/keycloak/deployment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../src/deployment/keycloak/deployment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAY1E,OAAO,KAAK,EACV,yBAAyB,EACzB,wBAAwB,EACxB,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EACzB,MAAM,YAAY,CAAC;AAEpB,qBAAa,cAAc;IAClB,SAAS,yBAAgC;IACzC,gBAAgB,EAAE,wBAAwB,CAAC;IAC3C,WAAW,EAAE,MAAM,CAAM;IACzB,KAAK,EAAE,MAAM,CAAM;IACnB,QAAQ,EAAE,MAAM,CAAM;IACtB,YAAY,EAAE,MAAM,CAAM;IACjC,OAAO,CAAC,YAAY,CAAoC;gBAE5C,OAAO,GAAE,yBAA8B;IAInD;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAa7B;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAUnC;;OAEG;IACG,gBAAgB,CAAC,OAAO,CAAC,EAAE;QAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;QACvC,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAC;QAC/B,KAAK,CAAC,EAAE,kBAAkB,EAAE,CAAC;KAC9B,GAAG,OAAO,CAAC,IAAI,CAAC;IAsCjB;;OAEG;IACG,OAAO,CAAC,MAAM,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB9D;;OAEG;IACG,WAAW,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB7D;;OAEG;IACG,YAAY,CAChB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,IAAI,CAAC;IAqChB;;OAEG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB5E;;OAEG;IACG,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA8C1E;;OAEG;IACG,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAe5D;;OAEG;IACG,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAQ9D;;OAEG;IACG,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWhE;;OAEG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYlE;;OAEG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW/C;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAK/B;;OAEG;IACG,cAAc,CAAC,OAAO,GAAE,MAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAW1D,OAAO,CAAC,sBAAsB;YAahB,eAAe;YAWf,YAAY;IAwBpB,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;YAO3B,gBAAgB;YAoBhB,sBAAsB;YActB,kBAAkB;YAQlB,0BAA0B;YAmD1B,eAAe;IAqB7B,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,IAAI;CAGb"}
+{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../src/deployment/keycloak/deployment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAY1E,OAAO,KAAK,EACV,yBAAyB,EACzB,wBAAwB,EACxB,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EACzB,MAAM,YAAY,CAAC;AAEpB,qBAAa,cAAc;IAClB,SAAS,yBAAgC;IACzC,gBAAgB,EAAE,wBAAwB,CAAC;IAC3C,WAAW,EAAE,MAAM,CAAM;IACzB,KAAK,EAAE,MAAM,CAAM;IACnB,QAAQ,EAAE,MAAM,CAAM;IACtB,YAAY,EAAE,MAAM,CAAM;IACjC,OAAO,CAAC,YAAY,CAAoC;gBAE5C,OAAO,GAAE,yBAA8B;IAInD;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAa7B;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAUnC;;OAEG;IACG,gBAAgB,CAAC,OAAO,CAAC,EAAE;QAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;QACvC,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAC;QAC/B,KAAK,CAAC,EAAE,kBAAkB,EAAE,CAAC;KAC9B,GAAG,OAAO,CAAC,IAAI,CAAC;IAsCjB;;OAEG;IACG,OAAO,CAAC,MAAM,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB9D;;OAEG;IACG,WAAW,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB7D;;OAEG;IACG,YAAY,CAChB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,IAAI,CAAC;IAqChB;;OAEG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB5E;;OAEG;IACG,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA8C1E;;OAEG;IACG,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAe5D;;OAEG;IACG,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAQ9D;;OAEG;IACG,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWhE;;OAEG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYlE;;OAEG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW/C;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAK/B;;OAEG;IACG,cAAc,CAAC,OAAO,GAAE,MAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAY1D,OAAO,CAAC,sBAAsB;YAahB,eAAe;YAWf,YAAY;IAwBpB,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;YAO3B,gBAAgB;YAoBhB,sBAAsB;YActB,kBAAkB;YAQlB,0BAA0B;YAmD1B,eAAe;IAqB7B,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,IAAI;CAGb"}

package/dist/deployment/keycloak/deployment.js

@@ -295,7 +295,8 @@ export class KeycloakHelper {
      */
     async waitUntilReady(timeout = 300) {
         this._log(`Waiting for Keycloak to be ready...`);
-        await this.k8sClient.waitForStatefulSetReady(this.deploymentConfig.namespace, this.deploymentConfig.releaseName, timeout);
+        const labelSelector = `app.kubernetes.io/instance=${this.deploymentConfig.releaseName}`;
+        await this.k8sClient.waitForPodsWithFailureDetection(this.deploymentConfig.namespace, labelSelector, timeout);
     }
     // Private methods
     _buildDeploymentConfig(options) {

package/dist/deployment/rhdh/deployment.d.ts

@@ -26,6 +26,11 @@ export declare class RHDHDeployment {
     waitUntilReady(timeout?: number): Promise<void>;
     teardown(): Promise<void>;
     private _resolveChartVersion;
+    /**
+     * Resolve the semantic version from the "next" tag by looking up the
+     * downstream image (rhdh-hub-rhel9) and finding tags with the same digest.
+     */
+    private _resolveVersionFromNextTag;
     private _buildDeploymentConfig;
     configure(deploymentOptions?: DeploymentOptions): Promise<void>;
     private _buildBaseUrl;

package/dist/deployment/rhdh/deployment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAiB1E,OAAO,KAAK,EACV,iBAAiB,EACjB,gBAAgB,EAGjB,MAAM,YAAY,CAAC;AAEpB,qBAAa,cAAc;IAClB,SAAS,yBAAgC;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,gBAAgB,CAAC;gBAE9B,SAAS,EAAE,MAAM;IAUvB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;YAqBf,eAAe;YAgBf,aAAa;IAe3B;;;OAGG;YACW,0BAA0B;YAuC1B,oBAAoB;YAWpB,eAAe;YAmCf,mBAAmB;IA4B3B,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAWrC;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpC,cAAc,CAAC,OAAO,GAAE,MAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBpD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAIjB,oBAAoB;IA6BlC,OAAO,CAAC,sBAAsB;IAoCxB,SAAS,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAcrE,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,IAAI;IAIZ,OAAO,CAAC,SAAS;CAmBlB"}
+{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAgB1E,OAAO,KAAK,EACV,iBAAiB,EACjB,gBAAgB,EAGjB,MAAM,YAAY,CAAC;AAEpB,qBAAa,cAAc;IAClB,SAAS,yBAAgC;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,gBAAgB,CAAC;gBAE9B,SAAS,EAAE,MAAM;IAUvB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;YAqBf,eAAe;YAgBf,aAAa;IAe3B;;;OAGG;YACW,0BAA0B;YAuC1B,oBAAoB;YAWpB,eAAe;YAmCf,mBAAmB;IAiD3B,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAWrC;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpC,cAAc,CAAC,OAAO,GAAE,MAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBpD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAIjB,oBAAoB;IAsClC;;;OAGG;YACW,0BAA0B;IAwCxC,OAAO,CAAC,sBAAsB;IAoCxB,SAAS,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAcrE,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,IAAI;IAIZ,OAAO,CAAC,SAAS;CAMlB"}

package/dist/deployment/rhdh/deployment.js

@@ -6,7 +6,6 @@ import { mergeYamlFilesIfExists, deepMerge } from "../../utils/merge-yamls.js";
 import { loadAndInjectPluginMetadata, generateDynamicPluginsConfigFromMetadata, } from "../../utils/plugin-metadata.js";
 import { envsubst } from "../../utils/common.js";
 import fs from "fs-extra";
-import boxen from "boxen";
 import { DEFAULT_CONFIG_PATHS, AUTH_CONFIG_PATHS, CHART_URL, } from "./constants.js";
 export class RHDHDeployment {
     k8sClient = new KubernetesClientHelper();
@@ -118,9 +117,25 @@ export class RHDHDeployment {
         ]);
         this._logBoxen("Subscription", subscriptionObject);
         fs.writeFileSync(`/tmp/${this.deploymentConfig.namespace}-subscription.yaml`, yaml.dump(subscriptionObject));
+        const version = this.deploymentConfig.version;
+        const isSemanticVersion = /^\d+(\.\d+)?$/.test(version);
+        // Use main branch for non-semantic versions (e.g., "next", "latest")
+        const branch = isSemanticVersion ? `release-${version}` : "main";
+        // Build version argument based on version type
+        let versionArg;
+        if (isSemanticVersion) {
+            versionArg = `-v ${version}`;
+        }
+        else if (version === "next") {
+            versionArg = "--next";
+        }
+        else {
+            throw new Error(`Invalid RHDH version "${version}". Use semantic version (e.g., "1.5") or "next".`);
+        }
+        this._log(`Using operator branch: ${branch}, version arg: ${versionArg}`);
         await $ `
       set -e;
-      curl -s https://raw.githubusercontent.com/redhat-developer/rhdh-operator/refs/heads/release-${this.deploymentConfig.version}/.rhdh/scripts/install-rhdh-catalog-source.sh | bash -s -- -v ${this.deploymentConfig.version} --install-operator rhdh
+      curl -sf https://raw.githubusercontent.com/redhat-developer/rhdh-operator/refs/heads/${branch}/.rhdh/scripts/install-rhdh-catalog-source.sh | bash -s -- ${versionArg} --install-operator rhdh
 
       timeout 300 bash -c '
         while ! oc get crd/backstages.rhdh.redhat.com -n "${this.deploymentConfig.namespace}" >/dev/null 2>&1; do
@@ -153,49 +168,79 @@ export class RHDHDeployment {
     }
     async waitUntilReady(timeout = 300) {
         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 {
-            await $ `oc rollout status deployment -l 'app.kubernetes.io/instance in (redhat-developer-hub,developer-hub)' -n ${this.deploymentConfig.namespace} --timeout=${timeout}s`;
+            await this.k8sClient.waitForPodsWithFailureDetection(this.deploymentConfig.namespace, labelSelector, timeout);
             this._log(`RHDH deployment is ready in namespace ${this.deploymentConfig.namespace}`);
         }
         catch (error) {
-            console.log("----------------------------------------------------------------");
-            console.log("Deployment Failed Logs");
-            console.log("----------------------------------------------------------------");
-            await $ `oc logs -l 'app.kubernetes.io/instance in (redhat-developer-hub,developer-hub)' -n ${this.deploymentConfig.namespace} --tail=100`;
-            throw new Error(`Error waiting for RHDH deployment to be ready in timeout ${timeout}s in namespace ${this.deploymentConfig.namespace}: ${error}`);
+            throw new Error(`RHDH deployment failed in namespace ${this.deploymentConfig.namespace}: ${error instanceof Error ? error.message : error}`);
         }
     }
     async teardown() {
         await this.k8sClient.deleteNamespace(this.deploymentConfig.namespace);
     }
     async _resolveChartVersion(version) {
-        // Semantic versions (e.g., 1.2)
-        if (/^(\d+(\.\d+)?)$/.test(version)) {
+        let resolvedVersion = version;
+        // Handle "next" tag by looking up the corresponding version from downstream image
+        if (version === "next") {
+            resolvedVersion = await this._resolveVersionFromNextTag();
+            this._log(`Resolved "next" tag to version: ${resolvedVersion}`);
+        }
+        // Semantic versions (e.g., 1.2, 1.10)
+        if (/^(\d+(\.\d+)?)$/.test(resolvedVersion)) {
             const response = await fetch("https://quay.io/api/v1/repository/rhdh/chart/tag/?onlyActiveTags=true&limit=600");
             if (!response.ok)
                 throw new Error(`Failed to fetch chart versions: ${response.statusText}`);
             const data = (await response.json());
             const matching = data.tags
                 .map((t) => t.name)
-                .filter((name) => name.startsWith(`${version}-`))
+                .filter((name) => name.startsWith(`${resolvedVersion}-`))
                 .sort((a, b) => a.localeCompare(b, undefined, { numeric: true }));
             const latest = matching.at(-1);
             if (!latest)
-                throw new Error(`No chart version found for ${version}`);
+                throw new Error(`No chart version found for ${resolvedVersion}`);
             return latest;
         }
         // CI build versions (e.g., 1.2.3-CI)
-        if (version.endsWith("CI"))
-            return version;
+        if (resolvedVersion.endsWith("CI"))
+            return resolvedVersion;
         throw new Error(`Invalid Helm chart version format: "${version}"`);
     }
+    /**
+     * Resolve the semantic version from the "next" tag by looking up the
+     * downstream image (rhdh-hub-rhel9) and finding tags with the same digest.
+     */
+    async _resolveVersionFromNextTag() {
+        // Fetch all active tags in a single API call
+        const response = await fetch("https://quay.io/api/v1/repository/rhdh/rhdh-hub-rhel9/tag/?onlyActiveTags=true&limit=75");
+        if (!response.ok) {
+            throw new Error(`Failed to fetch image tags: ${response.statusText}`);
+        }
+        // Use Record to avoid snake_case linting issues with Quay API response
+        const data = (await response.json());
+        // Find the "next" tag and get its digest
+        const nextTag = data.tags.find((t) => t["name"] === "next");
+        if (!nextTag) {
+            throw new Error('No "next" tag found in rhdh-hub-rhel9 repository');
+        }
+        const digest = nextTag["manifest_digest"];
+        this._log(`"next" tag digest: ${digest}`);
+        // Find semantic version tag (e.g., "1.10") with the same digest
+        const semanticVersionTag = data.tags.find((t) => t["manifest_digest"] === digest &&
+            /^\d+\.\d+$/.test(t["name"]));
+        if (!semanticVersionTag) {
+            throw new Error(`Could not find semantic version tag for "next" (digest: ${digest})`);
+        }
+        return semanticVersionTag["name"];
+    }
     _buildDeploymentConfig(input) {
-        const version = input.version ?? process.env.RHDH_VERSION;
-        const method = input.method ?? process.env.INSTALLATION_METHOD;
-        if (!version)
-            throw new Error("RHDH version is required");
-        if (!method)
-            throw new Error("Installation method (helm/operator) is required");
+        // Default to "next" if RHDH_VERSION not set
+        const version = input.version ?? process.env.RHDH_VERSION ?? "next";
+        // Default to "helm" if INSTALLATION_METHOD not set
+        const method = input.method ??
+            process.env.INSTALLATION_METHOD ??
+            "helm";
         const base = {
             version,
             namespace: input.namespace ?? this.deploymentConfig.namespace,
@@ -243,20 +288,9 @@ export class RHDHDeployment {
         console.log("[RHDHDeployment]", ...args);
     }
     _logBoxen(title, data) {
-        console.log(boxen(yaml.dump(data, { lineWidth: -1 }), {
-            title,
-            padding: 0,
-            width: 120,
-            borderStyle: {
-                topLeft: "┌",
-                topRight: "┐",
-                bottomLeft: "└",
-                bottomRight: "┘",
-                top: "─",
-                bottom: "─",
-                left: "",
-                right: "",
-            },
-        }));
+        const content = yaml.dump(data, { lineWidth: -1 });
+        console.log(`\n┌─ ${title} ${"─".repeat(60)}`);
+        console.log(content);
+        console.log(`└${"─".repeat(60 + title.length + 3)}\n`);
     }
 }

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

@@ -65,6 +65,24 @@ declare class KubernetesClientHelper {
      * Extract the URL from a route object
      */
     private _extractRouteUrl;
+    /**
+     * Failure states that indicate a pod will not recover without intervention
+     */
+    private static readonly failureReasons;
+    /**
+     * Wait for pods matching a label selector to be ready, with early failure detection.
+     * Fails fast when it detects unrecoverable states like CrashLoopBackOff.
+     *
+     * @param namespace - Namespace to watch
+     * @param labelSelector - Label selector (e.g., "app=myapp")
+     * @param timeoutSeconds - Maximum time to wait (default: 300)
+     * @param pollIntervalMs - How often to check pod status (default: 5000)
+     */
+    waitForPodsWithFailureDetection(namespace: string, labelSelector: string, timeoutSeconds?: number, pollIntervalMs?: number): Promise<void>;
+    /**
+     * Check if a pod is in a failure state. Returns failure info or null if healthy.
+     */
+    private _checkPodFailure;
 }
 export { KubernetesClientHelper };
 //# sourceMappingURL=kubernetes-client.d.ts.map

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;CAkBzB;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,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"}

package/dist/utils/kubernetes-client.js

@@ -376,5 +376,103 @@ class KubernetesClientHelper {
         const protocol = routeObj.spec?.tls ? "https" : "http";
         return `${protocol}://${host}`;
     }
+    /**
+     * Failure states that indicate a pod will not recover without intervention
+     */
+    static failureReasons = new Set([
+        "CrashLoopBackOff",
+        "Error",
+        "ImagePullBackOff",
+        "ErrImagePull",
+        "InvalidImageName",
+        "CreateContainerConfigError",
+        "CreateContainerError",
+    ]);
+    /**
+     * Wait for pods matching a label selector to be ready, with early failure detection.
+     * Fails fast when it detects unrecoverable states like CrashLoopBackOff.
+     *
+     * @param namespace - Namespace to watch
+     * @param labelSelector - Label selector (e.g., "app=myapp")
+     * @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) {
+        const startTime = Date.now();
+        const timeoutMs = timeoutSeconds * 1000;
+        console.log(`[K8sHelper] Waiting for pods (${labelSelector}) in ${namespace}...`);
+        while (Date.now() - startTime < timeoutMs) {
+            let pods;
+            try {
+                pods = (await this._k8sApi.listNamespacedPod({ namespace, labelSelector })).items;
+            }
+            catch (err) {
+                console.log(`[K8sHelper] API error, retrying: ${err}`);
+                await new Promise((r) => setTimeout(r, pollIntervalMs));
+                continue;
+            }
+            if (pods.length === 0) {
+                await new Promise((r) => setTimeout(r, pollIntervalMs));
+                continue;
+            }
+            for (const pod of pods) {
+                const podName = pod.metadata?.name || "unknown";
+                const failure = this._checkPodFailure(pod);
+                if (failure) {
+                    console.log(`[K8sHelper] Pod ${podName} failed: ${failure.reason}`);
+                    try {
+                        if (failure.container) {
+                            await $ `oc logs ${podName} -n ${namespace} -c ${failure.container} --tail=100`;
+                        }
+                        else {
+                            await $ `oc logs ${podName} -n ${namespace} --tail=100`;
+                        }
+                    }
+                    catch {
+                        // Ignore log fetch errors
+                    }
+                    throw new Error(`Pod ${podName} failed: ${failure.reason}`);
+                }
+            }
+            // Check if all pods are ready
+            const allReady = pods.every((pod) => {
+                const ready = pod.status?.conditions?.find((c) => c.type === "Ready");
+                return ready?.status === "True";
+            });
+            if (allReady) {
+                console.log(`[K8sHelper] All ${pods.length} pod(s) ready in ${namespace}`);
+                return;
+            }
+            await new Promise((r) => setTimeout(r, pollIntervalMs));
+        }
+        throw new Error(`Timeout waiting for pods (${labelSelector}) after ${timeoutSeconds}s`);
+    }
+    /**
+     * Check if a pod is in a failure state. Returns failure info or null if healthy.
+     */
+    _checkPodFailure(pod) {
+        // Check init containers first
+        for (const cs of pod.status?.initContainerStatuses || []) {
+            const reason = cs.state?.waiting?.reason;
+            if (reason && KubernetesClientHelper.failureReasons.has(reason)) {
+                return { reason: `Init:${reason}`, container: cs.name };
+            }
+            if (cs.state?.terminated?.exitCode &&
+                cs.state.terminated.exitCode !== 0) {
+                return {
+                    reason: `Init:Error (exit ${cs.state.terminated.exitCode})`,
+                    container: cs.name,
+                };
+            }
+        }
+        // Check main containers
+        for (const cs of pod.status?.containerStatuses || []) {
+            const reason = cs.state?.waiting?.reason;
+            if (reason && KubernetesClientHelper.failureReasons.has(reason)) {
+                return { reason, container: cs.name };
+            }
+        }
+        return null;
+    }
 }
 export { KubernetesClientHelper };

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":"AAMA;;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,CAmChC;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,CAmD/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,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"}

package/dist/utils/plugin-metadata.js

@@ -3,6 +3,75 @@ import path from "path";
 import yaml from "js-yaml";
 import { glob } from "zx";
 import { deepMerge } from "./merge-yamls.js";
+const OCI_REGISTRY_PREFIX = "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays";
+/**
+ * Fetches plugin versions from source repo and builds OCI URL map.
+ * Only called when GIT_PR_NUMBER is set.
+ */
+async function getOCIUrlsForPR(workspacePath, prNumber) {
+    const ociUrls = new Map();
+    const sourceJsonPath = path.join(workspacePath, "source.json");
+    const pluginsListPath = path.join(workspacePath, "plugins-list.yaml");
+    if (!fs.existsSync(sourceJsonPath)) {
+        throw new Error(`[PluginMetadata] PR build requires source.json but not found at: ${sourceJsonPath}`);
+    }
+    if (!fs.existsSync(pluginsListPath)) {
+        throw new Error(`[PluginMetadata] PR build requires plugins-list.yaml but not found at: ${pluginsListPath}`);
+    }
+    const sourceJson = JSON.parse(await fs.readFile(sourceJsonPath, "utf-8"));
+    const { repo, "repo-ref": ref, "repo-flat": repoFlat } = sourceJson;
+    if (!repo) {
+        throw new Error(`[PluginMetadata] source.json is missing required 'repo' field: ${sourceJsonPath}`);
+    }
+    if (!ref) {
+        throw new Error(`[PluginMetadata] source.json is missing required 'repo-ref' field: ${sourceJsonPath}`);
+    }
+    // Parse owner/repo from URL
+    const match = repo.match(/github\.com\/(.+?)(?:\.git)?$/);
+    if (!match) {
+        throw new Error(`[PluginMetadata] Failed to parse GitHub repo from source.json: ${repo}`);
+    }
+    const ownerRepo = match[1];
+    // Read plugins list
+    const pluginsList = await fs.readFile(pluginsListPath, "utf-8");
+    const pluginPaths = pluginsList
+        .trim()
+        .split("\n")
+        .map((l) => l.replace(/:$/, "").trim())
+        .filter(Boolean);
+    const workspaceName = path.basename(workspacePath);
+    console.log(`[PluginMetadata] Fetching versions for ${pluginPaths.length} plugins from source...`);
+    for (const pluginPath of pluginPaths) {
+        const pkgJsonPath = repoFlat
+            ? `${pluginPath}/package.json`
+            : `workspaces/${workspaceName}/${pluginPath}/package.json`;
+        const rawUrl = `https://raw.githubusercontent.com/${ownerRepo}/${ref}/${pkgJsonPath}`;
+        const res = await fetch(rawUrl);
+        if (!res.ok) {
+            throw new Error(`[PluginMetadata] Failed to fetch package.json for ${pluginPath}: ${res.status} ${res.statusText}\n` +
+                `  URL: ${rawUrl}`);
+        }
+        const pkgJson = (await res.json());
+        if (!pkgJson.name) {
+            throw new Error(`[PluginMetadata] package.json is missing 'name' field for ${pluginPath}\n` +
+                `  URL: ${rawUrl}`);
+        }
+        if (!pkgJson.version) {
+            throw new Error(`[PluginMetadata] package.json is missing 'version' field for ${pluginPath}\n` +
+                `  URL: ${rawUrl}`);
+        }
+        const { name, version } = pkgJson;
+        // @backstage-community/plugin-tech-radar -> backstage-community-plugin-tech-radar
+        const displayName = name.replace(/^@/, "").replace(/\//g, "-");
+        // TODO(RHDHBUGS-2530): Remove !alias suffix once Konflux builds include
+        // io.backstage.dynamic-packages annotation. The suffix is a workaround
+        // because install-dynamic-plugins.py can't auto-detect plugin path without it.
+        const ociUrl = `${OCI_REGISTRY_PREFIX}/${displayName}:pr_${prNumber}__${version}!${displayName}`;
+        ociUrls.set(displayName, ociUrl);
+        console.log(`[PluginMetadata] ${displayName} -> ${ociUrl}`);
+    }
+    return ociUrls;
+}
 /**
  * Checks if plugin metadata handling should be enabled.
  * This controls both auto-generation and injection of plugin metadata.
@@ -83,14 +152,10 @@ export async function parseMetadataFile(filePath) {
             console.log(`[PluginMetadata] Skipping ${filePath}: no spec.dynamicArtifact`);
             return null;
         }
-        if (!pluginConfig) {
-            console.log(`[PluginMetadata] Skipping ${filePath}: no spec.appConfigExamples[0].content`);
-            return null;
-        }
         console.log(`[PluginMetadata] Loaded metadata for: ${packagePath}`);
         return {
             packagePath,
-            pluginConfig,
+            pluginConfig: pluginConfig || {},
             packageName: packageName || "",
             sourceFile: filePath,
         };
@@ -190,12 +255,39 @@ 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 = [];
     for (const [pluginName, metadata] of metadataMap) {
-        console.log(`[PluginMetadata] Adding plugin from metadata: ${pluginName} (${metadata.packagePath})`);
+        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})`);
         plugins.push({
-            package: metadata.packagePath,
+            package: packageRef,
             disabled: false,
             pluginConfig: metadata.pluginConfig,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rhdh-e2e-test-utils",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "Test utilities for RHDH E2E tests",
   "license": "Apache-2.0",
   "type": "module",
@@ -82,7 +82,6 @@
     "@eslint/js": "^9.39.1",
     "@keycloak/keycloak-admin-client": "^26.0.0",
     "@kubernetes/client-node": "^1.4.0",
-    "boxen": "^8.0.1",
     "eslint": "^9.39.1",
     "eslint-plugin-check-file": "^3.3.1",
     "eslint-plugin-playwright": "^2.4.0",