From d95592b83d57fe0a850df5344ed27c07c10b9469 Mon Sep 17 00:00:00 2001
From: Subhash Khileri <skhileri@redhat.com>
Date: Wed, 10 Jun 2026 14:49:26 +0530
Subject: [PATCH] fix: fetch default.packages.yaml from
 rhdh-plugin-export-overlays for all branches

The file was deleted from the rhdh repo (PR #4932) and now lives in
rhdh-plugin-export-overlays for all branches including release-1.10.
Remove the legacy fallback URL that pointed to the rhdh repo.

Bump version to 1.10.0 for the release-1.10 branch versioning scheme.

Assisted-by: Claude Code
Co-Authored-By: Claude Code
---
 docs/changelog.md            |  8 +++++++-
 package.json                 |  2 +-
 src/utils/plugin-metadata.ts | 13 ++-----------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/docs/changelog.md b/docs/changelog.md
index 5430936..370de41 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -2,7 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
-## [1.1.45] - Current
+## [1.10.0] - Current
+
+### Fixed
+
+- **`default.packages.yaml` fetch URL**: All branches (including `release-1.10`) now fetch from `rhdh-plugin-export-overlays`. The legacy fallback to the `rhdh` repo has been removed since the file was deleted from there (rhdh PR #4932).
+
+## [1.1.45]
 
 ### Fixed
 
diff --git a/package.json b/package.json
index a71e710..ec85b51 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@red-hat-developer-hub/e2e-test-utils",
-  "version": "1.1.45",
+  "version": "1.10.0",
   "description": "Test utilities for RHDH E2E tests",
   "license": "Apache-2.0",
   "repository": {
diff --git a/src/utils/plugin-metadata.ts b/src/utils/plugin-metadata.ts
index 4dc6828..dd007ba 100644
--- a/src/utils/plugin-metadata.ts
+++ b/src/utils/plugin-metadata.ts
@@ -80,10 +80,6 @@ export function isNightlyJob(): boolean {
 const DEFAULT_PACKAGES_BASE_URL =
   "https://raw.githubusercontent.com/redhat-developer/rhdh-plugin-export-overlays/refs/heads";
 
-// release-1.10 still hosts default.packages.yaml in the rhdh repo (pre-migration)
-const LEGACY_DEFAULT_PACKAGES_BASE_URL =
-  "https://raw.githubusercontent.com/redhat-developer/rhdh/refs/heads";
-
 const DEFAULT_DPDY_OCI_REGISTRY = "registry.access.redhat.com/rhdh";
 
 interface DefaultPackagesYaml {
@@ -100,8 +96,7 @@ interface DefaultPackagesYaml {
  * {{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. For release-1.10 the file
- * lives in the rhdh repo; all other branches use rhdh-plugin-export-overlays.
+ * defaulting to "main" for local development.
  */
 export async function fetchDefaultPackages(): Promise<Set<string>> {
   const branch = process.env.RELEASE_BRANCH_NAME;
@@ -116,11 +111,7 @@ export async function fetchDefaultPackages(): Promise<Set<string>> {
     );
   }
   const resolvedBranch = branch || "main";
-  const baseUrl =
-    resolvedBranch === "release-1.10"
-      ? LEGACY_DEFAULT_PACKAGES_BASE_URL
-      : DEFAULT_PACKAGES_BASE_URL;
-  const url = `${baseUrl}/${resolvedBranch}/default.packages.yaml`;
+  const url = `${DEFAULT_PACKAGES_BASE_URL}/${resolvedBranch}/default.packages.yaml`;
 
   console.log(
     `[PluginMetadata] Fetching default packages from ${url} (branch: ${resolvedBranch})...`,