fix(homepage-e2e): merge chart dist + OCI dynamic plugins via patched e2e-test-utils

Bump @red-hat-developer-hub/e2e-test-utils to 1.1.18 and apply a Yarn patch
so dynamic-plugins merging uses getNormalizedPluginMergeKey (collapses chart
./dynamic-plugins/dist entries with OCI overrides). Removes the redundant
disabled dist stanza from dynamic-plugins.yaml to avoid install-dynamic-plugins
init failures in e2e-ocp-helm.

Made-with: Cursor

Author: HusneShabbir

workspaces/homepage/e2e-tests/.yarn/patches/@red-hat-developer-hub-e2e-test-utils-npm-1.1.18-b9e4ec0633.patch

@@ -0,0 +1,32 @@
+diff --git a/dist/deployment/rhdh/deployment.js b/dist/deployment/rhdh/deployment.js
+index 8a491091b27dc0ec80b17e33258d340493553fbc..301ead10b741e8a6ae756d76f40ed3fcf09f3d92 100644
+--- a/dist/deployment/rhdh/deployment.js
++++ b/dist/deployment/rhdh/deployment.js
+@@ -84,7 +84,12 @@ export class RHDHDeployment {
+             // Merge with package defaults and auth config. Use normalized plugin key so
+             // the same logical plugin (e.g. keycloak from metadata OCI + auth local path)
+             // is deduplicated; metadata (source) wins so OCI URL is kept on PR builds.
+-            const authPlugins = await mergeYamlFilesIfExists([DEFAULT_CONFIG_PATHS.dynamicPlugins, authConfig.dynamicPlugins], { arrayMergeStrategy: { byKey: "package" } });
++            const authPlugins = await mergeYamlFilesIfExists([DEFAULT_CONFIG_PATHS.dynamicPlugins, authConfig.dynamicPlugins], {
++                arrayMergeStrategy: {
++                    byKey: "package",
++                    normalizeKey: (item) => getNormalizedPluginMergeKey(item),
++                },
++            });
+             return deepMerge(authPlugins, metadataConfig, {
+                 arrayMergeStrategy: {
+                     byKey: "package",
+@@ -97,7 +102,12 @@ export class RHDHDeployment {
+             DEFAULT_CONFIG_PATHS.dynamicPlugins,
+             authConfig.dynamicPlugins,
+             userConfigPath,
+-        ], { arrayMergeStrategy: { byKey: "package" } });
++        ], {
++            arrayMergeStrategy: {
++                byKey: "package",
++                normalizeKey: (item) => getNormalizedPluginMergeKey(item),
++            },
++        });
+         // Inject plugin metadata configuration for plugins in the config
+         dynamicPluginsConfig =
+             await loadAndInjectPluginMetadata(dynamicPluginsConfig);

workspaces/homepage/e2e-tests/package.json

@@ -24,7 +24,7 @@
   "devDependencies": {
     "@eslint/js": "^9.39.2",
     "@playwright/test": "1.57.0",
-    "@red-hat-developer-hub/e2e-test-utils": "1.1.14",
+    "@red-hat-developer-hub/e2e-test-utils": "1.1.18",
     "@types/node": "^24.10.1",
     "dotenv": "^16.4.7",
     "eslint": "^9.39.2",
@@ -33,5 +33,8 @@
     "prettier": "^3.7.4",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.50.0"
+  },
+  "resolutions": {
+    "@red-hat-developer-hub/e2e-test-utils@1.1.18": "patch:@red-hat-developer-hub/e2e-test-utils@npm%3A1.1.18#./.yarn/patches/@red-hat-developer-hub-e2e-test-utils-npm-1.1.18-b9e4ec0633.patch"
   }
 }

workspaces/homepage/e2e-tests/tests/config/dynamic-plugins.yaml

@@ -1,11 +1,5 @@
-# RHDH ships this plugin from dynamic-plugins.default.yaml as
-# ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-dynamic-home-page with default
-# dynamicRoutes. Enabling the same frontend plugin again via GHCR with different dynamicRoutes
-# makes install-dynamic-plugins.py fail merging pluginConfig. Disable the dist entry first
-# (same pattern as workspaces/scorecard/e2e-tests/tests/config/dynamic-plugins.yaml).
+# Test-specific home cards; chart dist + OCI merge in e2e-test-utils (yarn patch on 1.1.18).
 plugins:
-  - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-dynamic-home-page
-    disabled: true
   - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-dynamic-home-page:bs_1.45.3__1.10.4!red-hat-developer-hub-backstage-plugin-dynamic-home-page
     disabled: false
     pluginConfig:

workspaces/homepage/e2e-tests/yarn.lock

@@ -16,6 +16,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@backstage-community/plugin-rbac-common@npm:1.23.0":
+  version: 1.23.0
+  resolution: "@backstage-community/plugin-rbac-common@npm:1.23.0"
+  peerDependencies:
+    "@backstage/errors": ^1.2.7
+    "@backstage/plugin-permission-common": ^0.9.5
+  checksum: 8cbb67a4854b9a72d329459cf37d05628da4ca4c665fb1e9c34e2dcbcd8d4399264b00bab8e4ee786717e2c0c5b0e3db7ee4eee6705424047a799fbf311eb5f4
+  languageName: node
+  linkType: hard
+
 "@eslint-community/eslint-utils@npm:^4.8.0, @eslint-community/eslint-utils@npm:^4.9.1":
   version: 4.9.1
   resolution: "@eslint-community/eslint-utils@npm:4.9.1"
@@ -291,11 +301,40 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@red-hat-developer-hub/e2e-test-utils@npm:1.1.14":
-  version: 1.1.14
-  resolution: "@red-hat-developer-hub/e2e-test-utils@npm:1.1.14"
+"@red-hat-developer-hub/e2e-test-utils@npm:1.1.18":
+  version: 1.1.18
+  resolution: "@red-hat-developer-hub/e2e-test-utils@npm:1.1.18"
+  dependencies:
+    "@axe-core/playwright": ^4.11.0
+    "@backstage-community/plugin-rbac-common": 1.23.0
+    "@eslint/js": ^9.39.1
+    "@keycloak/keycloak-admin-client": ^26.0.0
+    "@kubernetes/client-node": ^1.4.0
+    eslint: ^9.39.1
+    eslint-plugin-check-file: ^3.3.1
+    eslint-plugin-playwright: ^2.4.0
+    fs-extra: ^11.3.2
+    js-yaml: ^4.1.1
+    lodash.clonedeepwith: ^4.5.0
+    lodash.mergewith: ^4.6.2
+    otplib: 12.0.1
+    prettier: ^3.7.4
+    proper-lockfile: ^4.1.2
+    typescript: ^5.9.3
+    typescript-eslint: ^8.48.1
+    zx: ^8.8.5
+  peerDependencies:
+    "@playwright/test": ^1.57.0
+  checksum: 5d4905c47cba5abec532d6d71806c2e99093563437376964a8cb7e41a87a6862c7701f608adb94d7fb2c5036bbce04841e08e18955bf9fcd5e10b792cee90a44
+  languageName: node
+  linkType: hard
+
+"@red-hat-developer-hub/e2e-test-utils@patch:@red-hat-developer-hub/e2e-test-utils@npm%3A1.1.18#./.yarn/patches/@red-hat-developer-hub-e2e-test-utils-npm-1.1.18-b9e4ec0633.patch::locator=homepage-e2e-tests%40workspace%3A.":
+  version: 1.1.18
+  resolution: "@red-hat-developer-hub/e2e-test-utils@patch:@red-hat-developer-hub/e2e-test-utils@npm%3A1.1.18#./.yarn/patches/@red-hat-developer-hub-e2e-test-utils-npm-1.1.18-b9e4ec0633.patch::version=1.1.18&hash=7174a6&locator=homepage-e2e-tests%40workspace%3A."
   dependencies:
     "@axe-core/playwright": ^4.11.0
+    "@backstage-community/plugin-rbac-common": 1.23.0
     "@eslint/js": ^9.39.1
     "@keycloak/keycloak-admin-client": ^26.0.0
     "@kubernetes/client-node": ^1.4.0
@@ -314,7 +353,7 @@ __metadata:
     zx: ^8.8.5
   peerDependencies:
     "@playwright/test": ^1.57.0
-  checksum: 22264a01c79284deaa18c455b6477b7ea304fca62f2517cf347c1fc51131003d58db383e04bfcc0e8ddbe231d819f9ae0b9ee5497b2b00a2cff56ed70c1a1339
+  checksum: 2e9d73412938ed334076b852fc0bfdecde4c4cc94830175de584ee27e50bc263d4a941c29302a73666e16a570c4eda45d53e7dc0bb3dd3b4d21627fab1c1c86d
   languageName: node
   linkType: hard
 
@@ -1360,7 +1399,7 @@ __metadata:
   dependencies:
     "@eslint/js": ^9.39.2
     "@playwright/test": 1.57.0
-    "@red-hat-developer-hub/e2e-test-utils": 1.1.14
+    "@red-hat-developer-hub/e2e-test-utils": 1.1.18
     "@types/node": ^24.10.1
     dotenv: ^16.4.7
     eslint: ^9.39.2