@red-hat-developer-hub/e2e-test-utils 1.1.39 → 1.1.41

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/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;
     /**

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;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;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) {
@@ -358,14 +374,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/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/utils/plugin-metadata.d.ts

@@ -26,6 +26,25 @@ export interface DynamicPluginsConfig {
  * - E2E_NIGHTLY_MODE is set (manual override for local testing)
  */
 export declare function isNightlyJob(): boolean;
+/**
+ * Fetches the list of packages from default.packages.yaml (source for the
+ * dynamic-plugins.default.yaml — DPDY — in the catalog index image shipped
+ * with RHDH). Used in nightly mode to determine which plugins support
+ * {{inherit}} tag resolution vs which need full OCI refs from metadata.
+ *
+ * Branch is determined by RELEASE_BRANCH_NAME (set by OpenShift CI),
+ * defaulting to "main" for local development.
+ */
+export declare function fetchDefaultPackages(): Promise<Set<string>>;
+/**
+ * Resolves the OCI registry for a plugin's {{inherit}} ref in nightly mode.
+ *
+ * Resolution priority:
+ * 1. NIGHTLY_DPDY_OCI_REGISTRY_MAP — JSON object mapping registry → array of package names
+ * 2. NIGHTLY_DPDY_OCI_REGISTRY — blanket override for all plugins using {{inherit}}
+ * 3. Default: registry.access.redhat.com/rhdh
+ */
+export declare function getDpdyRegistry(packageName: string): string;
 /**
  * Extracts the plugin name from a package path or OCI reference.
  * Strips the `-dynamic` suffix so local paths and OCI refs for the same
@@ -82,15 +101,20 @@ export declare function generatePluginsFromMetadata(metadataPath?: string): Prom
  * Single entry point for both PR and nightly flows.
  *
  * Operations (in order):
- * 1. Inject appConfigExamples from metadata (PR mode only, unless RHDH_SKIP_PLUGIN_METADATA_INJECTION is set)
- * 2. Resolve all packages to OCI references:
- *    - PR with GIT_PR_NUMBER: workspace plugins in PR build → pr_ tags, rest unchanged
- *    - PR without GIT_PR_NUMBER: OCI plugins with metadata → metadata refs, rest unchanged
- *    - Nightly: OCI plugins with metadata → metadata refs, rest unchanged
+ * 1. Inject appConfigExamples from metadata:
+ *    - PR/local: all plugins with metadata (unless RHDH_SKIP_PLUGIN_METADATA_INJECTION)
+ *    - Nightly: only plugins NOT in default.packages.yaml with OCI metadata
+ *      (plugins in default.packages.yaml get both config and OCI tag via {{inherit}})
+ * 2. Resolve all packages:
+ *    - PR with GIT_PR_NUMBER: workspace plugins → pr_ OCI tags
+ *    - Nightly DPDY + OCI: {{inherit}} tag with configurable registry
+ *      (NIGHTLY_DPDY_OCI_REGISTRY_MAP > NIGHTLY_DPDY_OCI_REGISTRY > registry.access.redhat.com/rhdh)
+ *    - Nightly (not in default.packages.yaml) / local: metadata's dynamicArtifact as-is
  *
  * @param config The merged dynamic plugins configuration
  * @param metadataPath Optional custom path to metadata directory
+ * @param dpdyPackages Optional pre-loaded DPDY package set (for testing; fetched automatically if omitted in nightly)
  * @returns Processed configuration ready for deployment
  */
-export declare function processPluginsForDeployment(config: DynamicPluginsConfig, metadataPath?: string): Promise<DynamicPluginsConfig>;
+export declare function processPluginsForDeployment(config: DynamicPluginsConfig, metadataPath?: string, dpdyPackages?: Set<string>): Promise<DynamicPluginsConfig>;
 //# sourceMappingURL=plugin-metadata.d.ts.map

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":"AAWA,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB;AAaD,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,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;AAID;;;;;;;;;GASG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAqBtC;AAID;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAI5D;AAYD,eAAO,MAAM,qBAAqB,gBAAgB,CAAC;AAEnD,wBAAgB,oBAAoB,CAClC,YAAY,GAAE,MAA8B,GAC3C,MAAM,GAAG,IAAI,CAQf;AAED,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,CAAC,CAyBzB;AAED,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAwBtC;AA2JD;;;;;;;GAOG;AACH;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE;IACjD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,CAMT;AA0GD;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAW7E;AAED;;;;;;;GAOG;AACH,wBAAsB,2BAA2B,CAC/C,YAAY,GAAE,MAA8B,GAC3C,OAAO,CAAC,oBAAoB,CAAC,CAwB/B;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,oBAAoB,EAC5B,YAAY,GAAE,MAA8B,GAC3C,OAAO,CAAC,oBAAoB,CAAC,CA6B/B"}
+{"version":3,"file":"plugin-metadata.d.ts","sourceRoot":"","sources":["../../src/utils/plugin-metadata.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB;AAaD,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,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;AAID;;;;;;;;;GASG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAqBtC;AAgBD;;;;;;;;GAQG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CA2CjE;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAc3D;AAID;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAI5D;AAYD,eAAO,MAAM,qBAAqB,gBAAgB,CAAC;AAEnD,wBAAgB,oBAAoB,CAClC,YAAY,GAAE,MAA8B,GAC3C,MAAM,GAAG,IAAI,CAQf;AAED,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,CAAC,CAyBzB;AAED,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAwBtC;AA2JD;;;;;;;GAOG;AACH;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE;IACjD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,CAMT;AAoHD;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAW7E;AAED;;;;;;;GAOG;AACH,wBAAsB,2BAA2B,CAC/C,YAAY,GAAE,MAA8B,GAC3C,OAAO,CAAC,oBAAoB,CAAC,CAwB/B;AA2BD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,oBAAoB,EAC5B,YAAY,GAAE,MAA8B,EAC5C,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GACzB,OAAO,CAAC,oBAAoB,CAAC,CAsC/B"}

package/dist/utils/plugin-metadata.js

@@ -32,6 +32,69 @@ export function isNightlyJob() {
     }
     return false;
 }
+// ── Default Packages (DPDY) ──────────────────────────────────────────────────
+const DEFAULT_PACKAGES_BASE_URL = "https://raw.githubusercontent.com/redhat-developer/rhdh/refs/heads";
+const DEFAULT_DPDY_OCI_REGISTRY = "registry.access.redhat.com/rhdh";
+/**
+ * Fetches the list of packages from default.packages.yaml (source for the
+ * dynamic-plugins.default.yaml — DPDY — in the catalog index image shipped
+ * with RHDH). Used in nightly mode to determine which plugins support
+ * {{inherit}} tag resolution vs which need full OCI refs from metadata.
+ *
+ * Branch is determined by RELEASE_BRANCH_NAME (set by OpenShift CI),
+ * defaulting to "main" for local development.
+ */
+export async function fetchDefaultPackages() {
+    const branch = process.env.RELEASE_BRANCH_NAME;
+    if (!branch) {
+        if (process.env.CI) {
+            throw new Error("[PluginMetadata] RELEASE_BRANCH_NAME is required in CI to fetch default.packages.yaml");
+        }
+        console.log("[PluginMetadata] RELEASE_BRANCH_NAME not set — defaulting to 'main' (local dev)");
+    }
+    const resolvedBranch = branch || "main";
+    const url = `${DEFAULT_PACKAGES_BASE_URL}/${resolvedBranch}/default.packages.yaml`;
+    console.log(`[PluginMetadata] Fetching default packages from ${url} (branch: ${resolvedBranch})...`);
+    const response = await fetch(url);
+    if (!response.ok) {
+        throw new Error(`[PluginMetadata] Failed to fetch default.packages.yaml: ${response.status} ${response.statusText}\n` +
+            `  URL: ${url}\n` +
+            `  Branch: ${resolvedBranch} (from RELEASE_BRANCH_NAME)`);
+    }
+    const content = await response.text();
+    const parsed = yaml.load(content);
+    const packages = new Set();
+    for (const list of [parsed?.packages?.enabled, parsed?.packages?.disabled]) {
+        for (const entry of list || []) {
+            if (entry.package)
+                packages.add(entry.package);
+        }
+    }
+    console.log(`[PluginMetadata] Found ${packages.size} packages in default.packages.yaml (branch: ${resolvedBranch})`);
+    return packages;
+}
+/**
+ * Resolves the OCI registry for a plugin's {{inherit}} ref in nightly mode.
+ *
+ * Resolution priority:
+ * 1. NIGHTLY_DPDY_OCI_REGISTRY_MAP — JSON object mapping registry → array of package names
+ * 2. NIGHTLY_DPDY_OCI_REGISTRY — blanket override for all plugins using {{inherit}}
+ * 3. Default: registry.access.redhat.com/rhdh
+ */
+export function getDpdyRegistry(packageName) {
+    const map = process.env.NIGHTLY_DPDY_OCI_REGISTRY_MAP;
+    if (map) {
+        const parsed = JSON.parse(map);
+        for (const [registry, packages] of Object.entries(parsed)) {
+            if (packages.includes(packageName))
+                return registry;
+        }
+    }
+    if (process.env.NIGHTLY_DPDY_OCI_REGISTRY) {
+        return process.env.NIGHTLY_DPDY_OCI_REGISTRY;
+    }
+    return DEFAULT_DPDY_OCI_REGISTRY;
+}
 // ── Utilities ─────────────────────────────────────────────────────────────────
 /**
  * Extracts the plugin name from a package path or OCI reference.
@@ -211,7 +274,7 @@ export function getNormalizedPluginMergeKey(entry) {
     }
     return extractPluginName(pkg);
 }
-async function resolvePluginPackages(plugins, metadataMap, metadataPath) {
+async function resolvePluginPackages(plugins, metadataMap, metadataPath, dpdyPackages = null) {
     // Build PR OCI URLs if applicable
     const prNumber = process.env.GIT_PR_NUMBER;
     let prOciUrls = null;
@@ -224,7 +287,7 @@ async function resolvePluginPackages(plugins, metadataMap, metadataPath) {
         const pkg = plugin.package;
         const pluginName = extractPluginName(pkg);
         const metadata = metadataMap.get(pluginName);
-        // 1. With metadata: resolve to PR OCI URL or metadata's dynamicArtifact
+        // 1. With metadata: resolve to PR OCI URL, {{inherit}}, or metadata's dynamicArtifact
         if (metadata?.packageName) {
             const displayName = toDisplayName(metadata.packageName);
             // PR: use PR-specific OCI URL if this plugin is part of the PR build
@@ -235,9 +298,18 @@ async function resolvePluginPackages(plugins, metadataMap, metadataPath) {
                     return { ...plugin, package: prUrl };
                 }
             }
-            // Use metadata's dynamicArtifact directly (latest published version).
-            // This is more accurate than {{inherit}} because metadata is updated daily
-            // while the DPDY in the catalog index may lag behind.
+            // Nightly: if the plugin is in default.packages.yaml and its metadata
+            // spec.dynamicArtifact is an OCI ref, use {{inherit}} — RHDH resolves
+            // both the OCI tag and default config from its built-in DPDY.
+            // Registry: getDpdyRegistry() (env var overrides > default RHEC).
+            if (dpdyPackages?.has(metadata.packageName) &&
+                metadata.packagePath.startsWith("oci://")) {
+                const registry = getDpdyRegistry(metadata.packageName);
+                const inheritRef = `oci://${registry}/${displayName}:{{inherit}}`;
+                console.log(`[PluginMetadata] DPDY inherit: ${pkg} → ${inheritRef}`);
+                return { ...plugin, package: inheritRef };
+            }
+            // OCI: use metadata's dynamicArtifact directly (not in default.packages.yaml, or not nightly).
             if (metadata.packagePath.startsWith("oci://")) {
                 console.log(`[PluginMetadata] ${pkg} → ${metadata.packagePath}`);
                 return { ...plugin, package: metadata.packagePath };
@@ -249,10 +321,7 @@ async function resolvePluginPackages(plugins, metadataMap, metadataPath) {
             }
             return { ...plugin, package: metadata.packagePath };
         }
-        // 2. Local paths (./dynamic-plugins/dist/...) and other formats — keep as-is.
-        // Local paths reference plugins bundled in the RHDH container image and work
-        // without OCI resolution. When the catalog index moves all plugins to OCI refs,
-        // they'll be handled by step 1 or 2 above automatically.
+        // 2. No metadata — keep as-is (cross-workspace, npm packages, etc.)
         return plugin;
     });
 }
@@ -327,38 +396,60 @@ export async function generatePluginsFromMetadata(metadataPath = DEFAULT_METADAT
     console.log(`[PluginMetadata] Generated ${plugins.length} plugin entries from metadata`);
     return { plugins };
 }
+function selectMetadataForInjection(metadataMap, nightly, dpdyPackages) {
+    if (!process.env.CI &&
+        process.env.RHDH_SKIP_PLUGIN_METADATA_INJECTION === "true")
+        return null;
+    if (metadataMap.size === 0)
+        return null;
+    if (!nightly)
+        return metadataMap;
+    if (!dpdyPackages)
+        return null;
+    // Nightly: only inject config for plugins NOT in default.packages.yaml whose
+    // metadata is OCI. DPDY plugins get both config and OCI tag via {{inherit}}.
+    return new Map([...metadataMap].filter(([, m]) => !dpdyPackages.has(m.packageName) && m.packagePath.startsWith("oci://")));
+}
 /**
  * Processes a dynamic plugins configuration for deployment.
  * Single entry point for both PR and nightly flows.
  *
  * Operations (in order):
- * 1. Inject appConfigExamples from metadata (PR mode only, unless RHDH_SKIP_PLUGIN_METADATA_INJECTION is set)
- * 2. Resolve all packages to OCI references:
- *    - PR with GIT_PR_NUMBER: workspace plugins in PR build → pr_ tags, rest unchanged
- *    - PR without GIT_PR_NUMBER: OCI plugins with metadata → metadata refs, rest unchanged
- *    - Nightly: OCI plugins with metadata → metadata refs, rest unchanged
+ * 1. Inject appConfigExamples from metadata:
+ *    - PR/local: all plugins with metadata (unless RHDH_SKIP_PLUGIN_METADATA_INJECTION)
+ *    - Nightly: only plugins NOT in default.packages.yaml with OCI metadata
+ *      (plugins in default.packages.yaml get both config and OCI tag via {{inherit}})
+ * 2. Resolve all packages:
+ *    - PR with GIT_PR_NUMBER: workspace plugins → pr_ OCI tags
+ *    - Nightly DPDY + OCI: {{inherit}} tag with configurable registry
+ *      (NIGHTLY_DPDY_OCI_REGISTRY_MAP > NIGHTLY_DPDY_OCI_REGISTRY > registry.access.redhat.com/rhdh)
+ *    - Nightly (not in default.packages.yaml) / local: metadata's dynamicArtifact as-is
  *
  * @param config The merged dynamic plugins configuration
  * @param metadataPath Optional custom path to metadata directory
+ * @param dpdyPackages Optional pre-loaded DPDY package set (for testing; fetched automatically if omitted in nightly)
  * @returns Processed configuration ready for deployment
  */
-export async function processPluginsForDeployment(config, metadataPath = DEFAULT_METADATA_PATH) {
+export async function processPluginsForDeployment(config, metadataPath = DEFAULT_METADATA_PATH, dpdyPackages) {
     if (!config.plugins)
         return config;
-    const metadataMap = await tryLoadMetadata(metadataPath);
+    const nightly = isNightlyJob();
+    const [metadataMap, resolvedDpdyPackages] = await Promise.all([
+        tryLoadMetadata(metadataPath),
+        nightly ? (dpdyPackages ?? fetchDefaultPackages()) : Promise.resolve(null),
+    ]);
     let result = { ...config };
-    // Inject appConfigExamples from metadata (PR mode only)
-    if (!isNightlyJob() &&
-        process.env.RHDH_SKIP_PLUGIN_METADATA_INJECTION !== "true" &&
-        metadataMap.size > 0) {
-        console.log("[PluginMetadata] Injecting metadata configs...");
-        result = injectMetadataConfig(result, metadataMap);
+    // Inject appConfigExamples from metadata
+    const metadataToInject = selectMetadataForInjection(metadataMap, nightly, resolvedDpdyPackages);
+    if (metadataToInject && metadataToInject.size > 0) {
+        console.log(`[PluginMetadata] Injecting metadata configs for ${metadataToInject.size} plugin(s)...`);
+        result = injectMetadataConfig(result, metadataToInject);
     }
     // Resolve all packages to OCI references
-    console.log("[PluginMetadata] Resolving plugin packages to OCI...");
+    console.log("[PluginMetadata] Resolving plugin packages...");
     result = {
         ...result,
-        plugins: await resolvePluginPackages(result.plugins, metadataMap, metadataPath),
+        plugins: await resolvePluginPackages(result.plugins, metadataMap, metadataPath, resolvedDpdyPackages),
     };
     return result;
 }

package/dist/utils/tests/plugin-metadata.fixtures.test.js

@@ -179,11 +179,12 @@ describe("processPluginsForDeployment — workspace fixtures", () => {
                         },
                     ],
                 };
-                const result = await processPluginsForDeployment(config, metadataDir);
+                // Empty DPDY set — these plugins are not in default.packages.yaml
+                const result = await processPluginsForDeployment(config, metadataDir, new Set());
                 const plugins = result.plugins;
                 assert.ok(plugins[0].package.startsWith("oci://quay.io/rhdh/"), "must use quay.io registry from metadata, not the ghcr.io from user config");
                 assert.ok(plugins[0].package.includes("@sha256:c1d17d47aaa"), "must preserve digest from metadata");
-                assert.deepStrictEqual(plugins[0].pluginConfig, { events: { http: { topics: ["github"] } } }, "nightly must preserve user pluginConfig without metadata injection");
+                assert.deepStrictEqual(plugins[0].pluginConfig, { events: { http: { topics: ["github"] } } }, "nightly must preserve user pluginConfig for non-DPDY OCI plugin");
                 assert.strictEqual(plugins[1].package, "./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-dynamic", "local path from metadata must stay unchanged");
                 assert.deepStrictEqual(plugins[1].pluginConfig, { catalog: { providers: { github: { org: "janus-qe" } } } }, "nightly must preserve user pluginConfig for local path plugin");
             }
@@ -234,9 +235,9 @@ describe("processPluginsForDeployment — workspace fixtures", () => {
                 const prResult = await processPluginsForDeployment(config, metadataDir);
                 assert.ok(prResult.plugins[0].pluginConfig, "PR mode must inject pluginConfig for topology");
                 assert.strictEqual(prResult.plugins[0].package, "./dynamic-plugins/dist/backstage-community-plugin-topology", "local path must stay unchanged in PR mode");
-                // Nightly mode
+                // Nightly mode (empty DPDY set to avoid network fetch in unit tests)
                 process.env.E2E_NIGHTLY_MODE = "true";
-                const nightlyResult = await processPluginsForDeployment({ ...config, plugins: config.plugins.map((p) => ({ ...p })) }, metadataDir);
+                const nightlyResult = await processPluginsForDeployment({ ...config, plugins: config.plugins.map((p) => ({ ...p })) }, metadataDir, new Set());
                 assert.strictEqual(nightlyResult.plugins[0].pluginConfig, undefined, "nightly must not inject pluginConfig");
                 for (const result of [prResult, nightlyResult]) {
                     for (const plugin of result.plugins) {

package/dist/utils/tests/plugin-metadata.nightly.test.js

@@ -1,10 +1,11 @@
 /**
  * Nightly mode tests — isNightlyJob detection and nightly plugin resolution.
  */
+/* eslint-disable @typescript-eslint/naming-convention -- test fixtures use real plugin config keys with dots/dashes */
 import { describe, it, beforeEach, afterEach } from "node:test";
 import assert from "node:assert";
 import fs from "fs-extra";
-import { isNightlyJob, processPluginsForDeployment, } from "../plugin-metadata.js";
+import { isNightlyJob, processPluginsForDeployment, getDpdyRegistry, } from "../plugin-metadata.js";
 import { withCleanEnv, createMetadataFixture } from "./helpers.js";
 // ── isNightlyJob ─────────────────────────────────────────────────────────────
 describe("isNightlyJob", () => {
@@ -69,7 +70,7 @@ describe("processPluginsForDeployment — nightly mode", () => {
         process.env.E2E_NIGHTLY_MODE = "true";
     });
     afterEach(() => env.restore());
-    it("skips metadata injection in nightly mode", async () => {
+    it("skips metadata injection for wrapper plugins in nightly mode", async () => {
         const metadataDir = await createMetadataFixture([
             {
                 name: "backstage-community-plugin-tech-radar",
@@ -89,8 +90,8 @@ describe("processPluginsForDeployment — nightly mode", () => {
                     },
                 ],
             };
-            const result = await processPluginsForDeployment(config, metadataDir);
-            assert.strictEqual(result.plugins[0].pluginConfig, undefined, "nightly mode must NOT inject metadata pluginConfig");
+            const result = await processPluginsForDeployment(config, metadataDir, new Set(["@backstage-community/plugin-tech-radar"]));
+            assert.strictEqual(result.plugins[0].pluginConfig, undefined, "nightly mode must NOT inject metadata pluginConfig for wrapper plugins");
         }
         finally {
             await fs.remove(metadataDir);
@@ -120,14 +121,14 @@ describe("processPluginsForDeployment — nightly mode", () => {
                     },
                 ],
             };
-            const result = await processPluginsForDeployment(config, metadataDir);
+            const result = await processPluginsForDeployment(config, metadataDir, new Set());
             assert.deepStrictEqual(result.plugins[0].pluginConfig, userPluginConfig, "nightly mode must preserve user pluginConfig exactly as-is");
         }
         finally {
             await fs.remove(metadataDir);
         }
     });
-    it("resolves OCI plugin to metadata dynamicArtifact in nightly", async () => {
+    it("resolves non-DPDY OCI plugin to metadata dynamicArtifact in nightly", async () => {
         const metadataDir = await createMetadataFixture([
             {
                 name: "backstage-community-plugin-tekton",
@@ -144,8 +145,9 @@ describe("processPluginsForDeployment — nightly mode", () => {
                     },
                 ],
             };
-            const result = await processPluginsForDeployment(config, metadataDir);
-            assert.ok(result.plugins[0].package.includes("bs_1.45.3__3.33.3"), "nightly must resolve to metadata dynamicArtifact (latest published version)");
+            // Empty DPDY set — plugin is NOT in default.packages.yaml
+            const result = await processPluginsForDeployment(config, metadataDir, new Set());
+            assert.ok(result.plugins[0].package.includes("bs_1.45.3__3.33.3"), "non-DPDY OCI plugin must resolve to metadata dynamicArtifact");
         }
         finally {
             await fs.remove(metadataDir);
@@ -172,7 +174,7 @@ describe("processPluginsForDeployment — nightly mode", () => {
                     },
                 ],
             };
-            const result = await processPluginsForDeployment(config, metadataDir);
+            const result = await processPluginsForDeployment(config, metadataDir, new Set());
             assert.strictEqual(result.plugins[0].package, "./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-org-dynamic", "when metadata has a wrapper path, nightly must resolve to wrapper — not pass through stale OCI ref from user config");
         }
         finally {
@@ -196,7 +198,7 @@ describe("processPluginsForDeployment — nightly mode", () => {
                     },
                 ],
             };
-            const result = await processPluginsForDeployment(config, metadataDir);
+            const result = await processPluginsForDeployment(config, metadataDir, new Set());
             assert.strictEqual(result.plugins[0].package, "./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-quickstart", "local path plugins must not be converted to OCI in nightly");
         }
         finally {
@@ -204,3 +206,413 @@ describe("processPluginsForDeployment — nightly mode", () => {
         }
     });
 });
+// ── {{inherit}} resolution (DPDY plugins) ──────────────────────────────────
+describe("processPluginsForDeployment — nightly {{inherit}}", () => {
+    const env = withCleanEnv();
+    beforeEach(() => {
+        env.save();
+        delete process.env.GIT_PR_NUMBER;
+        process.env.E2E_NIGHTLY_MODE = "true";
+    });
+    afterEach(() => env.restore());
+    it("resolves DPDY OCI plugin to {{inherit}} tag with default RHEC registry", async () => {
+        const metadataDir = await createMetadataFixture([
+            {
+                name: "backstage-community-plugin-tekton",
+                packageName: "@backstage-community/plugin-tekton",
+                dynamicArtifact: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:bs_1.49.4__3.33.3!backstage-community-plugin-tekton",
+            },
+        ]);
+        try {
+            const config = {
+                plugins: [
+                    {
+                        package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:old_tag",
+                        disabled: false,
+                    },
+                ],
+            };
+            const dpdyPackages = new Set(["@backstage-community/plugin-tekton"]);
+            const result = await processPluginsForDeployment(config, metadataDir, dpdyPackages);
+            assert.strictEqual(result.plugins[0].package, "oci://registry.access.redhat.com/rhdh/backstage-community-plugin-tekton:{{inherit}}", "DPDY OCI plugin must resolve to {{inherit}} with default RHEC registry");
+        }
+        finally {
+            await fs.remove(metadataDir);
+        }
+    });
+    it("{{inherit}} ref has no !alias suffix", async () => {
+        const metadataDir = await createMetadataFixture([
+            {
+                name: "backstage-community-plugin-topology",
+                packageName: "@backstage-community/plugin-topology",
+                dynamicArtifact: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-topology:bs_1.49.4__1.2.0!backstage-community-plugin-topology",
+            },
+        ]);
+        try {
+            const config = {
+                plugins: [
+                    {
+                        package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-topology:old",
+                        disabled: false,
+                    },
+                ],
+            };
+            const result = await processPluginsForDeployment(config, metadataDir, new Set(["@backstage-community/plugin-topology"]));
+            assert.strictEqual(result.plugins[0].package, "oci://registry.access.redhat.com/rhdh/backstage-community-plugin-topology:{{inherit}}", "{{inherit}} ref must use default RHEC registry with no alias suffix");
+            assert.ok(!result.plugins[0].package.includes("!"), "{{inherit}} ref must NOT include !alias suffix");
+        }
+        finally {
+            await fs.remove(metadataDir);
+        }
+    });
+    it("{{inherit}} uses default RHEC even when metadata has ghcr.io (PR #2449 scenario)", async () => {
+        const metadataDir = await createMetadataFixture([
+            {
+                name: "red-hat-developer-hub-backstage-plugin-orchestrator",
+                packageName: "@red-hat-developer-hub/backstage-plugin-orchestrator",
+                dynamicArtifact: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator:bs_1.49.4__5.7.10!red-hat-developer-hub-backstage-plugin-orchestrator",
+            },
+        ]);
+        try {
+            const config = {
+                plugins: [
+                    {
+                        package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator:old",
+                        disabled: false,
+                    },
+                ],
+            };
+            const result = await processPluginsForDeployment(config, metadataDir, new Set(["@red-hat-developer-hub/backstage-plugin-orchestrator"]));
+            assert.strictEqual(result.plugins[0].package, "oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{inherit}}", "{{inherit}} must use default RHEC registry regardless of metadata's ghcr.io");
+        }
+        finally {
+            await fs.remove(metadataDir);
+        }
+    });
+    it("NIGHTLY_DPDY_OCI_REGISTRY overrides default registry for all plugins", async () => {
+        process.env.NIGHTLY_DPDY_OCI_REGISTRY =
+            "ghcr.io/redhat-developer/rhdh-plugin-export-overlays";
+        const metadataDir = await createMetadataFixture([
+            {
+                name: "backstage-community-plugin-tekton",
+                packageName: "@backstage-community/plugin-tekton",
+                dynamicArtifact: "oci://registry.access.redhat.com/rhdh/backstage-community-plugin-tekton@sha256:abc",
+            },
+        ]);
+        try {
+            const config = {
+                plugins: [
+                    {
+                        package: "oci://registry.access.redhat.com/rhdh/backstage-community-plugin-tekton@sha256:abc",
+                        disabled: false,
+                    },
+                ],
+            };
+            const result = await processPluginsForDeployment(config, metadataDir, new Set(["@backstage-community/plugin-tekton"]));
+            assert.strictEqual(result.plugins[0].package, "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:{{inherit}}", "NIGHTLY_DPDY_OCI_REGISTRY must override default RHEC registry");
+        }
+        finally {
+            await fs.remove(metadataDir);
+        }
+    });
+    it("NIGHTLY_DPDY_OCI_REGISTRY_MAP overrides registry for specific plugins", async () => {
+        process.env.NIGHTLY_DPDY_OCI_REGISTRY_MAP = JSON.stringify({
+            "ghcr.io/redhat-developer/rhdh-plugin-export-overlays": [
+                "@backstage-community/plugin-tekton",
+            ],
+        });
+        const metadataDir = await createMetadataFixture([
+            {
+                name: "backstage-community-plugin-tekton",
+                packageName: "@backstage-community/plugin-tekton",
+                dynamicArtifact: "oci://registry.access.redhat.com/rhdh/backstage-community-plugin-tekton@sha256:abc",
+            },
+            {
+                name: "red-hat-developer-hub-backstage-plugin-orchestrator",
+                packageName: "@red-hat-developer-hub/backstage-plugin-orchestrator",
+                dynamicArtifact: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator:bs_1.49.4__5.7.10!red-hat-developer-hub-backstage-plugin-orchestrator",
+            },
+        ]);
+        try {
+            const config = {
+                plugins: [
+                    {
+                        package: "oci://registry.access.redhat.com/rhdh/backstage-community-plugin-tekton@sha256:abc",
+                        disabled: false,
+                    },
+                    {
+                        package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator:old",
+                        disabled: false,
+                    },
+                ],
+            };
+            const dpdyPackages = new Set([
+                "@backstage-community/plugin-tekton",
+                "@red-hat-developer-hub/backstage-plugin-orchestrator",
+            ]);
+            const result = await processPluginsForDeployment(config, metadataDir, dpdyPackages);
+            assert.strictEqual(result.plugins[0].package, "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:{{inherit}}", "tekton must use ghcr.io from NIGHTLY_DPDY_OCI_REGISTRY_MAP");
+            assert.strictEqual(result.plugins[1].package, "oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{inherit}}", "orchestrator must use default RHEC (not in map)");
+        }
+        finally {
+            await fs.remove(metadataDir);
+        }
+    });
+    it("NIGHTLY_DPDY_OCI_REGISTRY_MAP takes precedence over NIGHTLY_DPDY_OCI_REGISTRY", async () => {
+        process.env.NIGHTLY_DPDY_OCI_REGISTRY = "quay.io/rhdh";
+        process.env.NIGHTLY_DPDY_OCI_REGISTRY_MAP = JSON.stringify({
+            "ghcr.io/redhat-developer/rhdh-plugin-export-overlays": [
+                "@backstage-community/plugin-tekton",
+            ],
+        });
+        const metadataDir = await createMetadataFixture([
+            {
+                name: "backstage-community-plugin-tekton",
+                packageName: "@backstage-community/plugin-tekton",
+                dynamicArtifact: "oci://registry.access.redhat.com/rhdh/backstage-community-plugin-tekton@sha256:abc",
+            },
+            {
+                name: "red-hat-developer-hub-backstage-plugin-orchestrator",
+                packageName: "@red-hat-developer-hub/backstage-plugin-orchestrator",
+                dynamicArtifact: "oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator@sha256:def",
+            },
+        ]);
+        try {
+            const config = {
+                plugins: [
+                    {
+                        package: "oci://registry.access.redhat.com/rhdh/backstage-community-plugin-tekton@sha256:abc",
+                        disabled: false,
+                    },
+                    {
+                        package: "oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator@sha256:def",
+                        disabled: false,
+                    },
+                ],
+            };
+            const dpdyPackages = new Set([
+                "@backstage-community/plugin-tekton",
+                "@red-hat-developer-hub/backstage-plugin-orchestrator",
+            ]);
+            const result = await processPluginsForDeployment(config, metadataDir, dpdyPackages);
+            assert.strictEqual(result.plugins[0].package, "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:{{inherit}}", "tekton must use ghcr.io from MAP (takes precedence over blanket)");
+            assert.strictEqual(result.plugins[1].package, "oci://quay.io/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{inherit}}", "orchestrator must use quay.io from NIGHTLY_DPDY_OCI_REGISTRY (blanket fallback)");
+        }
+        finally {
+            await fs.remove(metadataDir);
+        }
+    });
+    it("DPDY wrapper plugin keeps wrapper path (no {{inherit}})", async () => {
+        const metadataDir = await createMetadataFixture([
+            {
+                name: "backstage-community-plugin-tech-radar",
+                packageName: "@backstage-community/plugin-tech-radar",
+                dynamicArtifact: "./dynamic-plugins/dist/backstage-community-plugin-tech-radar",
+            },
+        ]);
+        try {
+            const config = {
+                plugins: [
+                    {
+                        package: "./dynamic-plugins/dist/backstage-community-plugin-tech-radar",
+                        disabled: false,
+                    },
+                ],
+            };
+            const result = await processPluginsForDeployment(config, metadataDir, new Set(["@backstage-community/plugin-tech-radar"]));
+            assert.strictEqual(result.plugins[0].package, "./dynamic-plugins/dist/backstage-community-plugin-tech-radar", "DPDY wrapper plugin must keep wrapper path, not use {{inherit}}");
+            assert.ok(!result.plugins[0].package.includes("inherit"), "wrapper plugin must not contain {{inherit}}");
+        }
+        finally {
+            await fs.remove(metadataDir);
+        }
+    });
+    it("non-DPDY OCI plugin uses full metadata ref (not {{inherit}})", async () => {
+        const metadataDir = await createMetadataFixture([
+            {
+                name: "red-hat-developer-hub-backstage-plugin-scorecard",
+                packageName: "@red-hat-developer-hub/backstage-plugin-scorecard",
+                dynamicArtifact: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-scorecard:bs_1.49.4__1.0.0!red-hat-developer-hub-backstage-plugin-scorecard",
+            },
+        ]);
+        try {
+            const config = {
+                plugins: [
+                    {
+                        package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-scorecard:old",
+                        disabled: false,
+                    },
+                ],
+            };
+            // Scorecard is NOT in the DPDY
+            const result = await processPluginsForDeployment(config, metadataDir, new Set(["@backstage-community/plugin-tekton"]));
+            assert.ok(result.plugins[0].package.includes("bs_1.49.4__1.0.0"), "non-DPDY OCI plugin must use full metadata ref");
+            assert.ok(!result.plugins[0].package.includes("inherit"), "non-DPDY OCI plugin must NOT use {{inherit}}");
+        }
+        finally {
+            await fs.remove(metadataDir);
+        }
+    });
+    it("skips config injection for DPDY OCI plugins", async () => {
+        const metadataDir = await createMetadataFixture([
+            {
+                name: "backstage-community-plugin-tekton",
+                packageName: "@backstage-community/plugin-tekton",
+                dynamicArtifact: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:bs_1.49.4__3.33.3!backstage-community-plugin-tekton",
+                appConfigExamples: {
+                    dynamicPlugins: {
+                        frontend: {
+                            "backstage-community.plugin-tekton": { enabled: true },
+                        },
+                    },
+                },
+            },
+        ]);
+        try {
+            const config = {
+                plugins: [
+                    {
+                        package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:old",
+                        disabled: false,
+                    },
+                ],
+            };
+            const result = await processPluginsForDeployment(config, metadataDir, new Set(["@backstage-community/plugin-tekton"]));
+            assert.strictEqual(result.plugins[0].pluginConfig, undefined, "DPDY plugin must NOT get metadata config injected — RHDH provides it via {{inherit}}");
+        }
+        finally {
+            await fs.remove(metadataDir);
+        }
+    });
+    it("injects config for non-DPDY OCI plugins", async () => {
+        const metadataDir = await createMetadataFixture([
+            {
+                name: "red-hat-developer-hub-backstage-plugin-scorecard",
+                packageName: "@red-hat-developer-hub/backstage-plugin-scorecard",
+                dynamicArtifact: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-scorecard:bs_1.49.4__1.0.0!red-hat-developer-hub-backstage-plugin-scorecard",
+                appConfigExamples: {
+                    scorecard: { apiUrl: "http://scorecard.example.com" },
+                },
+            },
+        ]);
+        try {
+            const config = {
+                plugins: [
+                    {
+                        package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-scorecard:old",
+                        disabled: false,
+                    },
+                ],
+            };
+            // Scorecard NOT in DPDY
+            const result = await processPluginsForDeployment(config, metadataDir, new Set());
+            assert.deepStrictEqual(result.plugins[0].pluginConfig, { scorecard: { apiUrl: "http://scorecard.example.com" } }, "non-DPDY OCI plugin must get metadata config injected in nightly");
+        }
+        finally {
+            await fs.remove(metadataDir);
+        }
+    });
+    it("mixed scenario: DPDY OCI → RHEC inherit, non-DPDY OCI → full ref + config", async () => {
+        const metadataDir = await createMetadataFixture([
+            {
+                name: "backstage-community-plugin-tekton",
+                packageName: "@backstage-community/plugin-tekton",
+                dynamicArtifact: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:bs_1.49.4__3.33.3!backstage-community-plugin-tekton",
+                appConfigExamples: {
+                    tekton: { enabled: true },
+                },
+            },
+            {
+                name: "red-hat-developer-hub-backstage-plugin-scorecard",
+                packageName: "@red-hat-developer-hub/backstage-plugin-scorecard",
+                dynamicArtifact: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-scorecard:bs_1.49.4__1.0.0!red-hat-developer-hub-backstage-plugin-scorecard",
+                appConfigExamples: {
+                    scorecard: { apiUrl: "http://scorecard.example.com" },
+                },
+            },
+        ]);
+        try {
+            const config = {
+                plugins: [
+                    {
+                        package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:old",
+                        disabled: false,
+                    },
+                    {
+                        package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-scorecard:old",
+                        disabled: false,
+                    },
+                ],
+            };
+            // Only tekton is in DPDY
+            const result = await processPluginsForDeployment(config, metadataDir, new Set(["@backstage-community/plugin-tekton"]));
+            // Tekton: DPDY → {{inherit}} with default RHEC, no config injection
+            assert.strictEqual(result.plugins[0].package, "oci://registry.access.redhat.com/rhdh/backstage-community-plugin-tekton:{{inherit}}", "DPDY plugin must use {{inherit}} with default RHEC registry");
+            assert.strictEqual(result.plugins[0].pluginConfig, undefined, "DPDY plugin must not have config injected");
+            // Scorecard: non-DPDY → full OCI ref, config injected
+            assert.ok(result.plugins[1].package.includes("bs_1.49.4__1.0.0"), "non-DPDY plugin must use full metadata ref");
+            assert.deepStrictEqual(result.plugins[1].pluginConfig, { scorecard: { apiUrl: "http://scorecard.example.com" } }, "non-DPDY OCI plugin must have config injected");
+        }
+        finally {
+            await fs.remove(metadataDir);
+        }
+    });
+});
+// ── getDpdyRegistry unit tests ──────────────────────────────────────────────
+describe("getDpdyRegistry", () => {
+    const env = withCleanEnv();
+    beforeEach(() => env.save());
+    afterEach(() => env.restore());
+    it("returns default RHEC registry when no env vars set", () => {
+        delete process.env.NIGHTLY_DPDY_OCI_REGISTRY;
+        delete process.env.NIGHTLY_DPDY_OCI_REGISTRY_MAP;
+        assert.strictEqual(getDpdyRegistry("@backstage-community/plugin-tekton"), "registry.access.redhat.com/rhdh");
+    });
+    it("NIGHTLY_DPDY_OCI_REGISTRY overrides default for all plugins", () => {
+        process.env.NIGHTLY_DPDY_OCI_REGISTRY =
+            "ghcr.io/redhat-developer/rhdh-plugin-export-overlays";
+        delete process.env.NIGHTLY_DPDY_OCI_REGISTRY_MAP;
+        assert.strictEqual(getDpdyRegistry("@backstage-community/plugin-tekton"), "ghcr.io/redhat-developer/rhdh-plugin-export-overlays");
+        assert.strictEqual(getDpdyRegistry("@red-hat-developer-hub/backstage-plugin-orchestrator"), "ghcr.io/redhat-developer/rhdh-plugin-export-overlays");
+    });
+    it("NIGHTLY_DPDY_OCI_REGISTRY_MAP returns mapped registry for listed plugin", () => {
+        delete process.env.NIGHTLY_DPDY_OCI_REGISTRY;
+        process.env.NIGHTLY_DPDY_OCI_REGISTRY_MAP = JSON.stringify({
+            "ghcr.io/redhat-developer/rhdh-plugin-export-overlays": [
+                "@backstage-community/plugin-tekton",
+                "@backstage-community/plugin-argocd",
+            ],
+        });
+        assert.strictEqual(getDpdyRegistry("@backstage-community/plugin-tekton"), "ghcr.io/redhat-developer/rhdh-plugin-export-overlays");
+        assert.strictEqual(getDpdyRegistry("@backstage-community/plugin-argocd"), "ghcr.io/redhat-developer/rhdh-plugin-export-overlays");
+    });
+    it("NIGHTLY_DPDY_OCI_REGISTRY_MAP falls back to default for unlisted plugin", () => {
+        delete process.env.NIGHTLY_DPDY_OCI_REGISTRY;
+        process.env.NIGHTLY_DPDY_OCI_REGISTRY_MAP = JSON.stringify({
+            "ghcr.io/redhat-developer/rhdh-plugin-export-overlays": [
+                "@backstage-community/plugin-tekton",
+            ],
+        });
+        assert.strictEqual(getDpdyRegistry("@red-hat-developer-hub/backstage-plugin-orchestrator"), "registry.access.redhat.com/rhdh", "unlisted plugin must fall back to default RHEC");
+    });
+    it("NIGHTLY_DPDY_OCI_REGISTRY_MAP takes precedence over NIGHTLY_DPDY_OCI_REGISTRY", () => {
+        process.env.NIGHTLY_DPDY_OCI_REGISTRY = "quay.io/rhdh";
+        process.env.NIGHTLY_DPDY_OCI_REGISTRY_MAP = JSON.stringify({
+            "ghcr.io/custom": ["@backstage-community/plugin-tekton"],
+        });
+        assert.strictEqual(getDpdyRegistry("@backstage-community/plugin-tekton"), "ghcr.io/custom", "MAP must take precedence over blanket");
+        assert.strictEqual(getDpdyRegistry("@red-hat-developer-hub/backstage-plugin-orchestrator"), "quay.io/rhdh", "unlisted plugin must fall back to blanket NIGHTLY_DPDY_OCI_REGISTRY");
+    });
+    it("supports multiple registries in NIGHTLY_DPDY_OCI_REGISTRY_MAP", () => {
+        delete process.env.NIGHTLY_DPDY_OCI_REGISTRY;
+        process.env.NIGHTLY_DPDY_OCI_REGISTRY_MAP = JSON.stringify({
+            "ghcr.io/redhat-developer/rhdh-plugin-export-overlays": [
+                "@backstage-community/plugin-tekton",
+            ],
+            "quay.io/rhdh": ["@red-hat-developer-hub/backstage-plugin-orchestrator"],
+        });
+        assert.strictEqual(getDpdyRegistry("@backstage-community/plugin-tekton"), "ghcr.io/redhat-developer/rhdh-plugin-export-overlays");
+        assert.strictEqual(getDpdyRegistry("@red-hat-developer-hub/backstage-plugin-orchestrator"), "quay.io/rhdh");
+        assert.strictEqual(getDpdyRegistry("@backstage-community/plugin-argocd"), "registry.access.redhat.com/rhdh", "unlisted plugin falls back to default");
+    });
+});

package/dist/utils/tests/plugin-metadata.pr.test.js

@@ -4,7 +4,7 @@
 import { describe, it, beforeEach, afterEach } from "node:test";
 import assert from "node:assert";
 import fs from "fs-extra";
-import { isNightlyJob, processPluginsForDeployment, } from "../plugin-metadata.js";
+import { processPluginsForDeployment, } from "../plugin-metadata.js";
 import { withCleanEnv, createMetadataFixture, createWorkspaceFixture, } from "./helpers.js";
 describe("processPluginsForDeployment — PR mode", () => {
     const env = withCleanEnv();
@@ -163,6 +163,7 @@ describe("processPluginsForDeployment — PR mode", () => {
         }
     });
     it("skips injection when RHDH_SKIP_PLUGIN_METADATA_INJECTION is 'true'", async () => {
+        delete process.env.CI;
         process.env.RHDH_SKIP_PLUGIN_METADATA_INJECTION = "true";
         const metadataDir = await createMetadataFixture([
             {
@@ -190,6 +191,35 @@ describe("processPluginsForDeployment — PR mode", () => {
             await fs.remove(metadataDir);
         }
     });
+    it("ignores RHDH_SKIP_PLUGIN_METADATA_INJECTION in CI", async () => {
+        process.env.CI = "true";
+        process.env.RHDH_SKIP_PLUGIN_METADATA_INJECTION = "true";
+        const metadataDir = await createMetadataFixture([
+            {
+                name: "backstage-community-plugin-tech-radar",
+                packageName: "@backstage-community/plugin-tech-radar",
+                dynamicArtifact: "./dynamic-plugins/dist/backstage-community-plugin-tech-radar",
+                appConfigExamples: {
+                    techRadar: { url: "http://default.example.com" },
+                },
+            },
+        ]);
+        try {
+            const config = {
+                plugins: [
+                    {
+                        package: "./dynamic-plugins/dist/backstage-community-plugin-tech-radar",
+                        disabled: false,
+                    },
+                ],
+            };
+            const result = await processPluginsForDeployment(config, metadataDir);
+            assert.ok(result.plugins[0].pluginConfig, "pluginConfig must be injected in CI even when RHDH_SKIP_PLUGIN_METADATA_INJECTION=true");
+        }
+        finally {
+            await fs.remove(metadataDir);
+        }
+    });
     it("does not skip injection when RHDH_SKIP_PLUGIN_METADATA_INJECTION is 'false'", async () => {
         process.env.RHDH_SKIP_PLUGIN_METADATA_INJECTION = "false";
         const metadataDir = await createMetadataFixture([
@@ -311,13 +341,66 @@ describe("processPluginsForDeployment — PR mode", () => {
             }
         });
     });
-    // ── PR vs nightly precedence ────────────────────────────────────────────
-    describe("PR vs nightly precedence", () => {
-        it("isNightlyJob returns false when both GIT_PR_NUMBER and E2E_NIGHTLY_MODE are set", () => {
+    // ── {{inherit}} must NOT apply in PR/local mode ─────────────────────────
+    describe("{{inherit}} does not apply in PR/local mode", () => {
+        it("DPDY OCI plugin uses metadata ref (not {{inherit}}) when GIT_PR_NUMBER is set", async () => {
             process.env.GIT_PR_NUMBER = "42";
             process.env.E2E_NIGHTLY_MODE = "true";
-            assert.strictEqual(isNightlyJob(), false, "GIT_PR_NUMBER must make isNightlyJob return false");
+            const { wsDir, metadataDir } = await createWorkspaceFixture([
+                {
+                    name: "backstage-community-plugin-tekton",
+                    packageName: "@backstage-community/plugin-tekton",
+                    dynamicArtifact: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:bs_1.49.4__3.33.3!backstage-community-plugin-tekton",
+                },
+            ]);
+            try {
+                const config = {
+                    plugins: [
+                        {
+                            package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:old_tag",
+                            disabled: false,
+                        },
+                    ],
+                };
+                const result = await processPluginsForDeployment(config, metadataDir);
+                assert.ok(!result.plugins[0].package.includes("{{inherit}}"), "{{inherit}} must NOT be used when GIT_PR_NUMBER is set (PR takes precedence)");
+            }
+            finally {
+                await fs.remove(wsDir);
+            }
         });
+        it("NIGHTLY_DPDY_OCI_REGISTRY env vars are ignored in PR/local mode", async () => {
+            delete process.env.GIT_PR_NUMBER;
+            delete process.env.E2E_NIGHTLY_MODE;
+            process.env.NIGHTLY_DPDY_OCI_REGISTRY = "quay.io/rhdh";
+            const metadataDir = await createMetadataFixture([
+                {
+                    name: "backstage-community-plugin-tekton",
+                    packageName: "@backstage-community/plugin-tekton",
+                    dynamicArtifact: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:bs_1.49.4__3.33.3!backstage-community-plugin-tekton",
+                },
+            ]);
+            try {
+                const config = {
+                    plugins: [
+                        {
+                            package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:old_tag",
+                            disabled: false,
+                        },
+                    ],
+                };
+                const result = await processPluginsForDeployment(config, metadataDir);
+                assert.ok(!result.plugins[0].package.includes("quay.io"), "NIGHTLY_DPDY_OCI_REGISTRY must be ignored in local/PR mode");
+                assert.ok(!result.plugins[0].package.includes("{{inherit}}"), "{{inherit}} must NOT be used in local/PR mode");
+                assert.ok(result.plugins[0].package.includes("bs_1.49.4__3.33.3"), "must use metadata dynamicArtifact in local/PR mode");
+            }
+            finally {
+                await fs.remove(metadataDir);
+            }
+        });
+    });
+    // ── PR vs nightly precedence ────────────────────────────────────────────
+    describe("PR vs nightly precedence", () => {
         it("injects metadata config when GIT_PR_NUMBER is set (PR mode despite nightly env)", async () => {
             process.env.GIT_PR_NUMBER = "42";
             process.env.E2E_NIGHTLY_MODE = "true";

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.39",
+  "version": "1.1.41",
   "description": "Test utilities for RHDH E2E tests",
   "license": "Apache-2.0",
   "repository": {