@red-hat-developer-hub/e2e-test-utils 2.1.5 → 2.1.6

package/dist/deployment/rhdh/deployment.js

@@ -6,7 +6,7 @@ import os from "os";
 import path from "path";
 import { test, request, expect } from "@playwright/test";
 import { mergeYamlFilesIfExists, deepMerge } from "../../utils/merge-yamls.js";
-import { generatePluginsFromMetadata, processPluginsForDeployment, getNormalizedPluginMergeKey, disablePluginWrappers, } from "../../utils/plugin-metadata.js";
+import { generatePluginsFromMetadata, processPluginsForDeployment, getNormalizedPluginMergeKey, disablePlugins, } from "../../utils/plugin-metadata.js";
 import { envsubst } from "../../utils/common.js";
 import { runOnce } from "../../playwright/run-once.js";
 import cloneDeepWith from "lodash.clonedeepwith";
@@ -127,7 +127,7 @@ export class RHDHDeployment {
     async _buildDynamicPluginsConfig() {
         const userConfigPath = this.deploymentConfig.dynamicPlugins;
         const userConfigExists = userConfigPath && fs.existsSync(userConfigPath);
-        const wrapperPlugins = disablePluginWrappers(this.deploymentConfig.disableWrappers);
+        const disabledPlugins = disablePlugins(this.deploymentConfig.disablePlugins);
         let config;
         if (userConfigExists) {
             this._log(`Using user config: ${userConfigPath}`);
@@ -140,9 +140,9 @@ export class RHDHDeployment {
         }
         // Process for deployment: inject metadata (PR only) + resolve all packages to OCI
         let result = await processPluginsForDeployment(config, WorkspacePaths.metadataDir);
-        // Disable wrapper plugins (PR builds only)
+        // Disable default plugins (PR builds only) — covers wrapper + OCI DPDY forms
         if (process.env.GIT_PR_NUMBER) {
-            result = deepMerge(result, wrapperPlugins, {
+            result = deepMerge(result, disabledPlugins, {
                 arrayMergeStrategy: "concat",
             });
         }
@@ -361,7 +361,7 @@ export class RHDHDeployment {
             appConfig: input.appConfig ?? WorkspacePaths.appConfig,
             secrets: input.secrets ?? WorkspacePaths.secrets,
             dynamicPlugins: input.dynamicPlugins ?? WorkspacePaths.dynamicPlugins,
-            disableWrappers: input.disableWrappers ?? [],
+            disablePlugins: input.disablePlugins ?? [],
             useNewFrontendSystem,
         };
         if (method === "helm") {

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

@@ -10,7 +10,11 @@ export type DeploymentOptions = {
     method?: DeploymentMethod;
     valueFile?: string;
     subscription?: string;
-    disableWrappers?: string[];
+    /**
+     * Default RHDH plugins to disable during PR builds (wrapper path + OCI
+     * `{{inherit}}`). Accepts display names, local paths, or OCI refs.
+     */
+    disablePlugins?: 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;
 };
@@ -29,7 +33,7 @@ export type DeploymentConfigBase = {
     appConfig: string;
     secrets: string;
     dynamicPlugins: string;
-    disableWrappers: string[];
+    disablePlugins: string[];
     /** New frontend system (Backstage app-next / NFS shell). */
     useNewFrontendSystem: boolean;
 };

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;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"}
+{"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;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,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,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,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

@@ -80,15 +80,33 @@ export declare function getNormalizedPluginMergeKey(entry: {
     package?: string;
 }): string;
 /**
- * Generates dynamic-plugins configuration for wrapper plugins
- * that need to be disabled. Each plugin entry contains:
- *  - package: ./dynamic-plugins/dist/$plugin-name
- *  - disabled: true
+ * Normalizes a disablePlugins entry to a DPDY display name.
+ * Accepts bare names, local wrapper paths, or OCI refs.
  *
- * @param plugins list of wrapper plugin names
- * @returns Dynamic plugins configuration that disables listed wrapper plugins
+ * Examples:
+ *  - red-hat-developer-hub-backstage-plugin-global-header
+ *  - ./dynamic-plugins/dist/backstage-plugin-kubernetes-dynamic
+ *  - oci://registry.access.redhat.com/rhdh/backstage-community-plugin-tekton:{{inherit}}
  */
-export declare function disablePluginWrappers(plugins: string[]): DynamicPluginsConfig;
+export declare function normalizeDisablePluginName(plugin: string): string;
+/**
+ * Generates dynamic-plugins configuration that disables default RHDH plugins
+ * listed in `disablePlugins`. For each
+ * normalized plugin name it emits two entries:
+ *  - local wrapper path: ./dynamic-plugins/dist/$plugin-name (older RHDH)
+ *  - OCI DPDY path: oci://<registry>/$plugin-name:{{inherit}} (RHDH 1.11+)
+ *
+ * Both are needed because DPDY moved from wrapper paths to OCI {{inherit}}
+ * refs; disabling only the wrapper leaves the OCI default enabled and causes
+ * mountPoints / config conflicts with the workspace's PR OCI image.
+ *
+ * Registry resolution: NIGHTLY_DPDY_OCI_REGISTRY, else
+ * registry.access.redhat.com/rhdh.
+ *
+ * @param plugins plugin names, wrapper paths, and/or OCI refs to disable
+ * @returns Dynamic plugins configuration that disables listed plugins
+ */
+export declare function disablePlugins(plugins: string[]): DynamicPluginsConfig;
 /**
  * Auto-generates plugin entries from workspace metadata files.
  * Creates raw entries with local paths and disabled: false.

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;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAgBD,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;AAoBD;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CA+CjE;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,CA2BzB;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;AA0HD;;;;;;;;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"}
+{"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;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAgBD,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;AAoBD;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CA+CjE;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,CA2BzB;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;AA0HD;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAajE;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAuBtE;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

@@ -367,21 +367,59 @@ function injectMetadataConfig(dynamicPluginsConfig, metadataMap) {
 }
 // ── Public API ────────────────────────────────────────────────────────────────
 /**
- * Generates dynamic-plugins configuration for wrapper plugins
- * that need to be disabled. Each plugin entry contains:
- *  - package: ./dynamic-plugins/dist/$plugin-name
- *  - disabled: true
+ * Normalizes a disablePlugins entry to a DPDY display name.
+ * Accepts bare names, local wrapper paths, or OCI refs.
  *
- * @param plugins list of wrapper plugin names
- * @returns Dynamic plugins configuration that disables listed wrapper plugins
+ * Examples:
+ *  - red-hat-developer-hub-backstage-plugin-global-header
+ *  - ./dynamic-plugins/dist/backstage-plugin-kubernetes-dynamic
+ *  - oci://registry.access.redhat.com/rhdh/backstage-community-plugin-tekton:{{inherit}}
  */
-export function disablePluginWrappers(plugins) {
+export function normalizeDisablePluginName(plugin) {
+    const trimmed = plugin.trim();
+    if (!trimmed)
+        return "";
+    if (trimmed.startsWith("oci://") ||
+        trimmed.startsWith("./") ||
+        trimmed.includes("/")) {
+        return extractPluginName(trimmed);
+    }
+    return trimmed.replace(/-dynamic$/, "");
+}
+/**
+ * Generates dynamic-plugins configuration that disables default RHDH plugins
+ * listed in `disablePlugins`. For each
+ * normalized plugin name it emits two entries:
+ *  - local wrapper path: ./dynamic-plugins/dist/$plugin-name (older RHDH)
+ *  - OCI DPDY path: oci://<registry>/$plugin-name:{{inherit}} (RHDH 1.11+)
+ *
+ * Both are needed because DPDY moved from wrapper paths to OCI {{inherit}}
+ * refs; disabling only the wrapper leaves the OCI default enabled and causes
+ * mountPoints / config conflicts with the workspace's PR OCI image.
+ *
+ * Registry resolution: NIGHTLY_DPDY_OCI_REGISTRY, else
+ * registry.access.redhat.com/rhdh.
+ *
+ * @param plugins plugin names, wrapper paths, and/or OCI refs to disable
+ * @returns Dynamic plugins configuration that disables listed plugins
+ */
+export function disablePlugins(plugins) {
     const pluginConfig = {
         plugins: [],
     };
+    const registry = process.env.NIGHTLY_DPDY_OCI_REGISTRY || DEFAULT_DPDY_OCI_REGISTRY;
+    const seen = new Set();
     for (const plugin of plugins) {
+        const name = normalizeDisablePluginName(plugin);
+        if (!name || seen.has(name))
+            continue;
+        seen.add(name);
+        pluginConfig.plugins.push({
+            package: `./dynamic-plugins/dist/${name}`,
+            disabled: true,
+        });
         pluginConfig.plugins.push({
-            package: `./dynamic-plugins/dist/${plugin}`,
+            package: `oci://${registry}/${name}:{{inherit}}`,
             disabled: true,
         });
     }

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

@@ -1,11 +1,11 @@
 /**
  * Pure utility function tests — no env vars, no file system fixtures.
- * Tests: extractPluginName, getNormalizedPluginMergeKey, disablePluginWrappers, generatePluginsFromMetadata
+ * Tests: extractPluginName, getNormalizedPluginMergeKey, disablePlugins, generatePluginsFromMetadata
  */
 import { describe, it } from "node:test";
 import assert from "node:assert";
 import fs from "fs-extra";
-import { extractPluginName, getNormalizedPluginMergeKey, disablePluginWrappers, generatePluginsFromMetadata, } from "../plugin-metadata.js";
+import { extractPluginName, getNormalizedPluginMergeKey, disablePlugins, normalizeDisablePluginName, generatePluginsFromMetadata, } from "../plugin-metadata.js";
 import { createMetadataFixture } from "./helpers.js";
 // ── extractPluginName ────────────────────────────────────────────────────────
 describe("extractPluginName", () => {
@@ -58,26 +58,82 @@ describe("getNormalizedPluginMergeKey", () => {
         assert.strictEqual(getNormalizedPluginMergeKey({ package: undefined }), "");
     });
 });
-// ── disablePluginWrappers ────────────────────────────────────────────────────
-describe("disablePluginWrappers", () => {
+// ── disablePlugins ───────────────────────────────────────────────────────────
+describe("normalizeDisablePluginName", () => {
+    it("keeps bare display names and strips -dynamic", () => {
+        assert.strictEqual(normalizeDisablePluginName("backstage-plugin-kubernetes"), "backstage-plugin-kubernetes");
+        assert.strictEqual(normalizeDisablePluginName("backstage-plugin-kubernetes-backend-dynamic"), "backstage-plugin-kubernetes-backend");
+    });
+    it("extracts names from wrapper paths and OCI refs", () => {
+        assert.strictEqual(normalizeDisablePluginName("./dynamic-plugins/dist/backstage-plugin-kubernetes-dynamic"), "backstage-plugin-kubernetes");
+        assert.strictEqual(normalizeDisablePluginName("oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-global-header:{{inherit}}"), "red-hat-developer-hub-backstage-plugin-global-header");
+    });
+});
+describe("disablePlugins", () => {
     it("returns empty plugins array for empty input", () => {
-        const result = disablePluginWrappers([]);
+        const result = disablePlugins([]);
         assert.deepStrictEqual(result, { plugins: [] });
     });
-    it("creates disabled entries with correct local path format", () => {
-        const result = disablePluginWrappers([
+    it("creates disabled local wrapper and OCI {{inherit}} entries per plugin", () => {
+        delete process.env.NIGHTLY_DPDY_OCI_REGISTRY;
+        const result = disablePlugins([
             "backstage-community-plugin-tech-radar",
             "backstage-plugin-kubernetes",
         ]);
-        assert.strictEqual(result.plugins.length, 2);
+        assert.strictEqual(result.plugins.length, 4);
         assert.deepStrictEqual(result.plugins[0], {
             package: "./dynamic-plugins/dist/backstage-community-plugin-tech-radar",
             disabled: true,
         });
         assert.deepStrictEqual(result.plugins[1], {
+            package: "oci://registry.access.redhat.com/rhdh/backstage-community-plugin-tech-radar:{{inherit}}",
+            disabled: true,
+        });
+        assert.deepStrictEqual(result.plugins[2], {
+            package: "./dynamic-plugins/dist/backstage-plugin-kubernetes",
+            disabled: true,
+        });
+        assert.deepStrictEqual(result.plugins[3], {
+            package: "oci://registry.access.redhat.com/rhdh/backstage-plugin-kubernetes:{{inherit}}",
+            disabled: true,
+        });
+    });
+    it("normalizes mixed input forms and deduplicates", () => {
+        delete process.env.NIGHTLY_DPDY_OCI_REGISTRY;
+        const result = disablePlugins([
+            "./dynamic-plugins/dist/backstage-plugin-kubernetes-dynamic",
+            "backstage-plugin-kubernetes",
+            "oci://registry.access.redhat.com/rhdh/backstage-plugin-kubernetes:{{inherit}}",
+        ]);
+        assert.strictEqual(result.plugins.length, 2);
+        assert.deepStrictEqual(result.plugins[0], {
             package: "./dynamic-plugins/dist/backstage-plugin-kubernetes",
             disabled: true,
         });
+        assert.deepStrictEqual(result.plugins[1], {
+            package: "oci://registry.access.redhat.com/rhdh/backstage-plugin-kubernetes:{{inherit}}",
+            disabled: true,
+        });
+    });
+    it("uses NIGHTLY_DPDY_OCI_REGISTRY for OCI disable entries when set", () => {
+        process.env.NIGHTLY_DPDY_OCI_REGISTRY = "quay.io/rhdh";
+        try {
+            const result = disablePlugins([
+                "red-hat-developer-hub-backstage-plugin-global-header",
+            ]);
+            assert.strictEqual(result.plugins.length, 2);
+            assert.deepStrictEqual(result.plugins[0], {
+                package: "./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-global-header",
+                disabled: true,
+            });
+            assert.deepStrictEqual(result.plugins[1], {
+                package: "oci://quay.io/rhdh/red-hat-developer-hub-backstage-plugin-global-header:{{inherit}}",
+                disabled: true,
+            });
+        }
+        finally {
+            delete process.env.NIGHTLY_DPDY_OCI_REGISTRY;
+        }
     });
 });
 // ── generatePluginsFromMetadata ──────────────────────────────────────────────

package/package.json

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