@red-hat-developer-hub/e2e-test-utils 1.1.40 → 1.1.42

package/dist/deployment/rhdh/config/new-frontend-system/dynamic-plugins.yaml

@@ -0,0 +1,5 @@
+plugins:
+  - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-app-auth:bs_1.49.4__0.0.1
+    disabled: false
+  - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-app-integrations:bs_1.49.4__0.0.1
+    disabled: false

package/dist/deployment/rhdh/config/new-frontend-system/secrets.yaml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: rhdh-secrets
+type: Opaque
+stringData:
+  APP_CONFIG_app_packageName: app-next
+  ENABLE_STANDARD_MODULE_FEDERATION: "true"

package/dist/deployment/rhdh/config/new-frontend-system/value_file.yaml

@@ -0,0 +1,2 @@
+# Helm values merge layer for the new frontend system (app-next); merged when NFS layers are active (additive; extend as needed).
+{}

package/dist/deployment/rhdh/config/operator/subscription.yaml

@@ -1,4 +1,4 @@
-apiVersion: rhdh.redhat.com/v1alpha3
+apiVersion: rhdh.redhat.com/v1alpha5
 kind: Backstage
 metadata:
   name: developer-hub

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

@@ -4,6 +4,12 @@ export declare const DEFAULT_CONFIG_PATHS: {
     appConfig: string;
     secrets: string;
     dynamicPlugins: string;
+    /** New frontend system (app-next): paths merged when the deployment uses NFS layers (explicit flag, `-app-next` namespace, or `USE_NEW_FRONTEND_SYSTEM`). */
+    newFrontendSystem: {
+        secrets: string;
+        dynamicPlugins: string;
+        valueFile: string;
+    };
     helm: {
         valueFile: string;
     };

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/constants.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAK1D,eAAO,MAAM,oBAAoB;;;;;;;;;;CAyBhC,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,MAAM,CACpC,YAAY,EACZ;IACE,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,YAAY,CAAC;CAC9B,CAoCF,CAAC;AAEF,eAAO,MAAM,SAAS,6BAA6B,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/constants.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAK1D,eAAO,MAAM,oBAAoB;;;;IAa/B,6JAA6J;;;;;;;;;;;;CA2B9J,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,MAAM,CACpC,YAAY,EACZ;IACE,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,YAAY,CAAC;CAC9B,CAoCF,CAAC;AAEF,eAAO,MAAM,SAAS,6BAA6B,CAAC"}

package/dist/deployment/rhdh/constants.js

@@ -5,6 +5,12 @@ export const DEFAULT_CONFIG_PATHS = {
     appConfig: path.join(PACKAGE_ROOT, "dist/deployment/rhdh/config/common/app-config-rhdh.yaml"),
     secrets: path.join(PACKAGE_ROOT, "dist/deployment/rhdh/config/common/rhdh-secrets.yaml"),
     dynamicPlugins: path.join(PACKAGE_ROOT, "dist/deployment/rhdh/config/common/dynamic-plugins.yaml"),
+    /** New frontend system (app-next): paths merged when the deployment uses NFS layers (explicit flag, `-app-next` namespace, or `USE_NEW_FRONTEND_SYSTEM`). */
+    newFrontendSystem: {
+        secrets: path.join(PACKAGE_ROOT, "dist/deployment/rhdh/config/new-frontend-system/secrets.yaml"),
+        dynamicPlugins: path.join(PACKAGE_ROOT, "dist/deployment/rhdh/config/new-frontend-system/dynamic-plugins.yaml"),
+        valueFile: path.join(PACKAGE_ROOT, "dist/deployment/rhdh/config/new-frontend-system/value_file.yaml"),
+    },
     helm: {
         valueFile: path.join(PACKAGE_ROOT, "dist/deployment/rhdh/config/helm/value_file.yaml"),
     },

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

@@ -13,8 +13,8 @@ export declare class RHDHDeployment {
     /** Shared merge strategy for dynamic plugin arrays. */
     private static readonly pluginMergeOpts;
     /**
-     * Merges package defaults + auth config (+ optional user config) into a
-     * single dynamic plugins configuration.
+     * Merges package defaults + auth + optional new-frontend-system defaults +
+     * optional user config into a single dynamic plugins configuration.
      */
     private _mergeBaseConfigs;
     /**
@@ -34,6 +34,7 @@ export declare class RHDHDeployment {
     private _applyDynamicPlugins;
     private _deployWithHelm;
     private _deployWithOperator;
+    private get _labelSelector();
     rolloutRestart(): Promise<void>;
     /**
      * Performs a clean restart by scaling down to 0 first, waiting for pods to terminate,

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;AAwB1E,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;IAKvB,MAAM,CAAC,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YA0CpD,eAAe;YAmBf,aAAa;IAqB3B,uDAAuD;IACvD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAE5B;IAEX;;;OAGG;YACW,iBAAiB;IAY/B;;OAEG;YACW,uBAAuB;IAgBrC;;;;;;;;OAQG;YACW,0BAA0B;YAsC1B,oBAAoB;YAWpB,eAAe;YA6Df,mBAAmB;IAoE3B,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;IA8BpD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAIjB,iBAAiB;YASjB,oBAAoB;IAsClC;;;OAGG;YACW,0BAA0B;IAwCxC,OAAO,CAAC,sBAAsB;IAoCxB,SAAS,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrE,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,IAAI;IAIZ,OAAO,CAAC,SAAS;CAMlB"}
+{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAwB1E,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;IAKvB,MAAM,CAAC,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YA0CpD,eAAe;YAmBf,aAAa;IA2B3B,uDAAuD;IACvD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAE5B;IAEX;;;OAGG;YACW,iBAAiB;IAe/B;;OAEG;YACW,uBAAuB;IAgBrC;;;;;;;;OAQG;YACW,0BAA0B;YAsC1B,oBAAoB;YAWpB,eAAe;YAuEf,mBAAmB;IAmCjC,OAAO,KAAK,cAAc,GAIzB;IAEK,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;IA6BpD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAIjB,iBAAiB;YASjB,oBAAoB;IAsClC;;;OAGG;YACW,0BAA0B;IAwCxC,OAAO,CAAC,sBAAsB;IA2CxB,SAAS,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrE,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,IAAI;IAIZ,OAAO,CAAC,SAAS;CAMlB"}

package/dist/deployment/rhdh/deployment.js

@@ -62,32 +62,40 @@ export class RHDHDeployment {
     }
     async _applySecrets() {
         const authConfig = AUTH_CONFIG_PATHS[this.deploymentConfig.auth];
-        const secretsYaml = await mergeYamlFilesIfExists([
+        const secretsPaths = [
             DEFAULT_CONFIG_PATHS.secrets,
             authConfig.secrets,
+            ...(this.deploymentConfig.useNewFrontendSystem
+                ? [DEFAULT_CONFIG_PATHS.newFrontendSystem.secrets]
+                : []),
             this.deploymentConfig.secrets,
-        ]);
+        ];
+        const secretsYaml = await mergeYamlFilesIfExists(secretsPaths);
         // Use cloneDeepWith to substitute env vars in-place, avoiding JSON.parse issues
         // with control characters in secrets (e.g., private keys with newlines)
         const substituted = cloneDeepWith(secretsYaml, (value) => {
             if (typeof value === "string")
                 return envsubst(value);
         });
-        await this.k8sClient.applySecretFromObject("rhdh-secrets", substituted, this.deploymentConfig.namespace);
+        const secretPayload = substituted;
+        await this.k8sClient.applySecretFromObject("rhdh-secrets", secretPayload, this.deploymentConfig.namespace);
     }
     /** Shared merge strategy for dynamic plugin arrays. */
     static pluginMergeOpts = {
         arrayMergeStrategy: { byKey: "package" },
     };
     /**
-     * Merges package defaults + auth config (+ optional user config) into a
-     * single dynamic plugins configuration.
+     * Merges package defaults + auth + optional new-frontend-system defaults +
+     * optional user config into a single dynamic plugins configuration.
      */
     async _mergeBaseConfigs(userConfigPath) {
         const authConfig = AUTH_CONFIG_PATHS[this.deploymentConfig.auth];
         const paths = [
             DEFAULT_CONFIG_PATHS.dynamicPlugins,
             authConfig.dynamicPlugins,
+            ...(this.deploymentConfig.useNewFrontendSystem
+                ? [DEFAULT_CONFIG_PATHS.newFrontendSystem.dynamicPlugins]
+                : []),
             ...(userConfigPath ? [userConfigPath] : []),
         ];
         return await mergeYamlFilesIfExists(paths, RHDHDeployment.pluginMergeOpts);
@@ -148,10 +156,18 @@ export class RHDHDeployment {
     async _deployWithHelm(valueFile) {
         const chartVersion = await this._resolveChartVersion(this.deploymentConfig.version);
         this._log(`Helm chart version resolved to: ${chartVersion}`);
-        const valueFileObject = (await mergeYamlFilesIfExists([
+        const helmValuePaths = [
             DEFAULT_CONFIG_PATHS.helm.valueFile,
+            ...(this.deploymentConfig.useNewFrontendSystem
+                ? [DEFAULT_CONFIG_PATHS.newFrontendSystem.valueFile]
+                : []),
             valueFile,
-        ]));
+            ...(this.deploymentConfig.useNewFrontendSystem &&
+                fs.existsSync(WorkspacePaths.valueFileAppNext)
+                ? [WorkspacePaths.valueFileAppNext]
+                : []),
+        ];
+        const valueFileObject = (await mergeYamlFilesIfExists(helmValuePaths));
         this._logBoxen("Value File", valueFileObject);
         // Merge dynamic plugins into the values file (including auth-specific plugins)
         if (!valueFileObject.global) {
@@ -213,44 +229,20 @@ export class RHDHDeployment {
             });
             this._log(`Catalog index image: ${catalogIndexImage}`);
         }
-        this._logBoxen("Subscription", subscriptionObject);
+        this._logBoxen("Backstage CR", subscriptionObject);
         const subscriptionFilePath = path.join(os.tmpdir(), `${this.deploymentConfig.namespace}-subscription.yaml`);
         fs.writeFileSync(subscriptionFilePath, 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 -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
-          echo "Waiting for Backstage CRD to be created..."
-          sleep 20
-        done
-        echo "Backstage CRD is created."
-      ' || echo "Error: Timed out waiting for Backstage CRD creation."
-
-      oc apply -f "${subscriptionFilePath}" -n "${this.deploymentConfig.namespace}"
-    `;
-        this._log("Operator deployment executed successfully.");
+        await $ `oc apply -f "${subscriptionFilePath}" -n "${this.deploymentConfig.namespace}"`;
+        this._log("Backstage CR applied successfully.");
+    }
+    get _labelSelector() {
+        return this.deploymentConfig.method === "operator"
+            ? "rhdh.redhat.com/app=backstage-developer-hub"
+            : "app.kubernetes.io/instance in (redhat-developer-hub,developer-hub)";
     }
     async rolloutRestart() {
         this._log(`Restarting RHDH deployment in namespace ${this.deploymentConfig.namespace}...`);
-        await $ `oc rollout restart deployment -l 'app.kubernetes.io/instance in (redhat-developer-hub,developer-hub)' -n ${this.deploymentConfig.namespace}`;
+        await $ `oc rollout restart deployment -l '${this._labelSelector}' -n ${this.deploymentConfig.namespace}`;
         this._log(`RHDH deployment restarted successfully in namespace ${this.deploymentConfig.namespace}`);
         await this.waitUntilReady();
     }
@@ -261,13 +253,13 @@ export class RHDHDeployment {
      */
     async scaleDownAndRestart() {
         const namespace = this.deploymentConfig.namespace;
-        await $ `oc scale deployment -l 'app.kubernetes.io/instance in (redhat-developer-hub,developer-hub)' --replicas=0 -n ${namespace}`;
-        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}`;
+        await $ `oc scale deployment -l '${this._labelSelector}' --replicas=0 -n ${namespace}`;
+        await $ `oc wait --for=delete pod -l '${this._labelSelector}' -n ${namespace} --timeout=120s || true`;
+        await $ `oc scale deployment -l '${this._labelSelector}' --replicas=1 -n ${namespace}`;
     }
     async waitUntilReady(timeout = 500) {
         const namespace = this.deploymentConfig.namespace;
-        const labelSelector = "app.kubernetes.io/instance in (redhat-developer-hub,developer-hub)";
+        const labelSelector = this._labelSelector;
         const startTime = Date.now();
         try {
             await this.k8sClient.waitForPodsWithFailureDetection(namespace, labelSelector, timeout);
@@ -358,14 +350,19 @@ export class RHDHDeployment {
         const method = input.method ??
             process.env.INSTALLATION_METHOD ??
             "helm";
+        const namespace = input.namespace ?? this.deploymentConfig.namespace;
+        const useNewFrontendSystem = input.useNewFrontendSystem ??
+            (namespace.endsWith("-app-next") ||
+                process.env.USE_NEW_FRONTEND_SYSTEM === "true");
         const base = {
             version,
-            namespace: input.namespace ?? this.deploymentConfig.namespace,
+            namespace,
             auth: input.auth ?? "keycloak",
             appConfig: input.appConfig ?? WorkspacePaths.appConfig,
             secrets: input.secrets ?? WorkspacePaths.secrets,
             dynamicPlugins: input.dynamicPlugins ?? WorkspacePaths.dynamicPlugins,
             disableWrappers: input.disableWrappers ?? [],
+            useNewFrontendSystem,
         };
         if (method === "helm") {
             return {

package/dist/deployment/rhdh/deployment.test.js

@@ -38,4 +38,54 @@ describe("dynamic-plugins merge (no user config path)", () => {
         assert.strictEqual(plugins.length, 1, "merged config must have exactly one keycloak plugin");
         assert.ok(plugins[0].package?.startsWith("oci://"), "metadata (OCI) must win over auth local path");
     });
+    it("keeps user app-auth OCI ref over NFS defaults for same logical plugin", () => {
+        const nfsDefaults = {
+            plugins: [
+                {
+                    package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-app-auth:bs_1.49.4__0.0.1",
+                    disabled: false,
+                },
+            ],
+        };
+        const userPlugins = {
+            plugins: [
+                {
+                    package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-app-auth:older__0.0.1",
+                    disabled: false,
+                },
+            ],
+        };
+        const merged = deepMerge(nfsDefaults, userPlugins, {
+            arrayMergeStrategy: {
+                byKey: "package",
+                normalizeKey: (item) => getNormalizedPluginMergeKey(item),
+            },
+        });
+        const plugins = merged.plugins;
+        assert.strictEqual(plugins.length, 1);
+        assert.ok(plugins[0].package?.includes("older__0.0.1"), "user layer must win over NFS defaults for the same logical plugin");
+    });
+    it("does not duplicate includes when NFS layer omits includes", () => {
+        const common = {
+            includes: ["dynamic-plugins.default.yaml"],
+            plugins: [],
+        };
+        const nfsLayer = {
+            plugins: [
+                {
+                    package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-app-auth:bs_1.49.4__0.0.1",
+                    disabled: false,
+                },
+            ],
+        };
+        const merged = deepMerge(common, nfsLayer, {
+            arrayMergeStrategy: {
+                byKey: "package",
+                normalizeKey: (item) => getNormalizedPluginMergeKey(item),
+            },
+        });
+        const includes = merged.includes;
+        assert.strictEqual(includes?.length, 1);
+        assert.strictEqual(includes[0], "dynamic-plugins.default.yaml");
+    });
 });

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

@@ -1,2 +1,3 @@
 export { RHDHDeployment } from "./deployment.js";
+export * from "./types.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,cAAc,YAAY,CAAC"}

package/dist/deployment/rhdh/index.js

@@ -1 +1,2 @@
 export { RHDHDeployment } from "./deployment.js";
+export * from "./types.js";

package/dist/deployment/rhdh/operator-setup.d.ts

@@ -0,0 +1,2 @@
+export declare function installRHDHOperator(): Promise<void>;
+//# sourceMappingURL=operator-setup.d.ts.map

package/dist/deployment/rhdh/operator-setup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"operator-setup.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/operator-setup.ts"],"names":[],"mappings":"AAEA,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CA0DzD"}

package/dist/deployment/rhdh/operator-setup.js

@@ -0,0 +1,46 @@
+import { $ } from "../../utils/bash.js";
+export async function installRHDHOperator() {
+    if (process.env.INSTALLATION_METHOD !== "operator") {
+        return;
+    }
+    if (process.env.SKIP_OPERATOR_INSTALLATION === "true") {
+        console.log("Skipping RHDH operator installation");
+        return;
+    }
+    const version = process.env.RHDH_VERSION ?? "next";
+    const isSemanticVersion = /^\d+(\.\d+)?$/.test(version);
+    const branch = isSemanticVersion ? `release-${version}` : "main";
+    let versionArgs;
+    if (isSemanticVersion) {
+        versionArgs = ["-v", version];
+    }
+    else if (version === "next") {
+        versionArgs = ["--next"];
+    }
+    else {
+        throw new Error(`Invalid RHDH version "${version}". Use semantic version (e.g., "1.5") or "next".`);
+    }
+    console.log(`Installing RHDH operator (branch: ${branch}, version: ${versionArgs.join(" ")})...`);
+    const scriptUrl = `https://raw.githubusercontent.com/redhat-developer/rhdh-operator/refs/heads/${branch}/.rhdh/scripts/install-rhdh-catalog-source.sh`;
+    try {
+        await $ `curl -sf ${scriptUrl} | bash -s -- ${versionArgs} --install-operator rhdh`;
+    }
+    catch (error) {
+        throw new Error(`install-rhdh-catalog-source.sh failed (branch: ${branch}, args: ${versionArgs.join(" ")} --install-operator rhdh).\nScript URL: ${scriptUrl}\n${error instanceof Error ? error.message : error}`, { cause: error });
+    }
+    try {
+        await $ `
+      timeout 300 bash -c '
+        while ! oc get crd backstages.rhdh.redhat.com >/dev/null 2>&1; do
+          echo "Waiting for Backstage CRD to be created..."
+          sleep 10
+        done
+        echo "Backstage CRD is created."
+      '
+    `;
+    }
+    catch (error) {
+        throw new Error("Timed out waiting for Backstage CRD (backstages.rhdh.redhat.com) after 300s. The operator may not have installed correctly.", { cause: error });
+    }
+    console.log("RHDH operator installation completed");
+}

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

@@ -11,6 +11,8 @@ export type DeploymentOptions = {
     valueFile?: string;
     subscription?: string;
     disableWrappers?: string[];
+    /** When true, merge new-frontend-system (app-next) layers. When omitted, auto-detect: namespace ends with `-app-next` or `USE_NEW_FRONTEND_SYSTEM=true`. Pass false to disable. */
+    useNewFrontendSystem?: boolean;
 };
 export type HelmDeploymentConfig = {
     method: "helm";
@@ -28,6 +30,8 @@ export type DeploymentConfigBase = {
     secrets: string;
     dynamicPlugins: string;
     disableWrappers: string[];
+    /** New frontend system (Backstage app-next / NFS shell). */
+    useNewFrontendSystem: boolean;
 };
 export type DeploymentConfig = DeploymentConfigBase & (HelmDeploymentConfig | OperatorDeploymentConfig);
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,UAAU,CAAC;AACnD,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,UAAU,GAAG,QAAQ,CAAC;AAE3D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,MAAM,EAAE,UAAU,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,YAAY,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,oBAAoB,GACjD,CAAC,oBAAoB,GAAG,wBAAwB,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,UAAU,CAAC;AACnD,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,UAAU,GAAG,QAAQ,CAAC;AAE3D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,mLAAmL;IACnL,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,MAAM,EAAE,UAAU,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,YAAY,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,4DAA4D;IAC5D,oBAAoB,EAAE,OAAO,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,oBAAoB,GACjD,CAAC,oBAAoB,GAAG,wBAAwB,CAAC,CAAC"}

package/dist/playwright/global-setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global-setup.d.ts","sourceRoot":"","sources":["../../src/playwright/global-setup.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AA6EnD,wBAA8B,WAAW,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ3E"}
+{"version":3,"file":"global-setup.d.ts","sourceRoot":"","sources":["../../src/playwright/global-setup.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AA8EnD,wBAA8B,WAAW,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ3E"}

package/dist/playwright/global-setup.js

@@ -7,6 +7,7 @@ import { resolve } from "path";
 import { KubernetesClientHelper } from "../utils/kubernetes-client.js";
 import { $ } from "../utils/bash.js";
 import { KeycloakHelper } from "../deployment/keycloak/index.js";
+import { installRHDHOperator } from "../deployment/rhdh/operator-setup.js";
 import { DEFAULT_KEYCLOAK_CONFIG, DEFAULT_RHDH_CLIENT, DEFAULT_USERS, } from "../deployment/keycloak/constants.js";
 import { loadLocalVaultSecrets } from "../utils/vault.js";
 const REQUIRED_BINARIES = ["oc", "kubectl", "helm"];
@@ -67,7 +68,7 @@ export default async function globalSetup(config) {
     await loadLocalVaultSecrets();
     loadDotenvFromProjects(config);
     await setClusterRouterBaseEnv();
-    await deployKeycloak();
+    await Promise.all([installRHDHOperator(), deployKeycloak()]);
     console.log("Global setup completed successfully");
 }
 /**

package/dist/utils/workspace-paths.d.ts

@@ -37,6 +37,8 @@ export declare class WorkspacePaths {
     static get dynamicPlugins(): string;
     /** Default Helm value file path: `tests/config/value_file.yaml` */
     static get valueFile(): string;
+    /** Optional Helm values merged after `value_file.yaml` when the new frontend system is active (explicit option, namespace suffix `-app-next`, or `USE_NEW_FRONTEND_SYSTEM=true`) and this file exists. */
+    static get valueFileAppNext(): string;
     /** Default operator subscription path: `tests/config/subscription.yaml` */
     static get subscription(): string;
 }

package/dist/utils/workspace-paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-paths.d.ts","sourceRoot":"","sources":["../../src/utils/workspace-paths.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,cAAc;IACzB,OAAO;IAEP,4FAA4F;IAC5F,MAAM,KAAK,OAAO,IAAI,MAAM,CAE3B;IAED,4DAA4D;IAC5D,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAI5C,0DAA0D;IAC1D,MAAM,KAAK,aAAa,IAAI,MAAM,CAEjC;IAED,8DAA8D;IAC9D,MAAM,KAAK,WAAW,IAAI,MAAM,CAE/B;IAED,gFAAgF;IAChF,MAAM,KAAK,SAAS,IAAI,MAAM,CAE7B;IAID,mEAAmE;IACnE,MAAM,KAAK,SAAS,IAAI,MAAM,CAE7B;IAED,6DAA6D;IAC7D,MAAM,KAAK,OAAO,IAAI,MAAM,CAE3B;IAED,wEAAwE;IACxE,MAAM,KAAK,cAAc,IAAI,MAAM,CAElC;IAED,mEAAmE;IACnE,MAAM,KAAK,SAAS,IAAI,MAAM,CAE7B;IAED,2EAA2E;IAC3E,MAAM,KAAK,YAAY,IAAI,MAAM,CAEhC;CACF"}
+{"version":3,"file":"workspace-paths.d.ts","sourceRoot":"","sources":["../../src/utils/workspace-paths.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,cAAc;IACzB,OAAO;IAEP,4FAA4F;IAC5F,MAAM,KAAK,OAAO,IAAI,MAAM,CAE3B;IAED,4DAA4D;IAC5D,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAI5C,0DAA0D;IAC1D,MAAM,KAAK,aAAa,IAAI,MAAM,CAEjC;IAED,8DAA8D;IAC9D,MAAM,KAAK,WAAW,IAAI,MAAM,CAE/B;IAED,gFAAgF;IAChF,MAAM,KAAK,SAAS,IAAI,MAAM,CAE7B;IAID,mEAAmE;IACnE,MAAM,KAAK,SAAS,IAAI,MAAM,CAE7B;IAED,6DAA6D;IAC7D,MAAM,KAAK,OAAO,IAAI,MAAM,CAE3B;IAED,wEAAwE;IACxE,MAAM,KAAK,cAAc,IAAI,MAAM,CAElC;IAED,mEAAmE;IACnE,MAAM,KAAK,SAAS,IAAI,MAAM,CAE7B;IAED,0MAA0M;IAC1M,MAAM,KAAK,gBAAgB,IAAI,MAAM,CAEpC;IAED,2EAA2E;IAC3E,MAAM,KAAK,YAAY,IAAI,MAAM,CAEhC;CACF"}

package/dist/utils/workspace-paths.js

@@ -58,6 +58,10 @@ export class WorkspacePaths {
     static get valueFile() {
         return path.resolve(this.e2eRoot, "tests/config/value_file.yaml");
     }
+    /** Optional Helm values merged after `value_file.yaml` when the new frontend system is active (explicit option, namespace suffix `-app-next`, or `USE_NEW_FRONTEND_SYSTEM=true`) and this file exists. */
+    static get valueFileAppNext() {
+        return path.resolve(this.e2eRoot, "tests/config/value_file-app-next.yaml");
+    }
     /** Default operator subscription path: `tests/config/subscription.yaml` */
     static get subscription() {
         return path.resolve(this.e2eRoot, "tests/config/subscription.yaml");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@red-hat-developer-hub/e2e-test-utils",
-  "version": "1.1.40",
+  "version": "1.1.42",
   "description": "Test utilities for RHDH E2E tests",
   "license": "Apache-2.0",
   "repository": {