Skip to content

Commit 2bc9fc0

Browse files
fix: fetch default.packages.yaml from rhdh-plugin-export-overlays for non-1.10 branches
The file was moved from the rhdh repo to rhdh-plugin-export-overlays. release-1.10 continues to use the legacy rhdh repo URL; all other branches (main, release-1.11+) now fetch from rhdh-plugin-export-overlays. Assisted-by: Claude Code Co-Authored-By: Claude Code
1 parent b627cb2 commit 2bc9fc0

3 files changed

Lines changed: 19 additions & 4 deletions

File tree

docs/changelog.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22

33
All notable changes to this project will be documented in this file.
44

5-
## [1.1.44] - Current
5+
## [1.1.45] - Current
6+
7+
### Fixed
8+
9+
- **`default.packages.yaml` fetch URL**: `release-1.10` continues to fetch from the `rhdh` repo; all other branches (including `main`) now fetch from `rhdh-plugin-export-overlays` where the file was moved.
10+
11+
## [1.1.44]
612

713
### Changed
814

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@red-hat-developer-hub/e2e-test-utils",
3-
"version": "1.1.44",
3+
"version": "1.1.45",
44
"description": "Test utilities for RHDH E2E tests",
55
"license": "Apache-2.0",
66
"repository": {

src/utils/plugin-metadata.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ export function isNightlyJob(): boolean {
7878
// ── Default Packages (DPDY) ──────────────────────────────────────────────────
7979

8080
const DEFAULT_PACKAGES_BASE_URL =
81+
"https://raw.githubusercontent.com/redhat-developer/rhdh-plugin-export-overlays/refs/heads";
82+
83+
// release-1.10 still hosts default.packages.yaml in the rhdh repo (pre-migration)
84+
const LEGACY_DEFAULT_PACKAGES_BASE_URL =
8185
"https://raw.githubusercontent.com/redhat-developer/rhdh/refs/heads";
8286

8387
const DEFAULT_DPDY_OCI_REGISTRY = "registry.access.redhat.com/rhdh";
@@ -96,7 +100,8 @@ interface DefaultPackagesYaml {
96100
* {{inherit}} tag resolution vs which need full OCI refs from metadata.
97101
*
98102
* Branch is determined by RELEASE_BRANCH_NAME (set by OpenShift CI),
99-
* defaulting to "main" for local development.
103+
* defaulting to "main" for local development. For release-1.10 the file
104+
* lives in the rhdh repo; all other branches use rhdh-plugin-export-overlays.
100105
*/
101106
export async function fetchDefaultPackages(): Promise<Set<string>> {
102107
const branch = process.env.RELEASE_BRANCH_NAME;
@@ -111,7 +116,11 @@ export async function fetchDefaultPackages(): Promise<Set<string>> {
111116
);
112117
}
113118
const resolvedBranch = branch || "main";
114-
const url = `${DEFAULT_PACKAGES_BASE_URL}/${resolvedBranch}/default.packages.yaml`;
119+
const baseUrl =
120+
resolvedBranch === "release-1.10"
121+
? LEGACY_DEFAULT_PACKAGES_BASE_URL
122+
: DEFAULT_PACKAGES_BASE_URL;
123+
const url = `${baseUrl}/${resolvedBranch}/default.packages.yaml`;
115124

116125
console.log(
117126
`[PluginMetadata] Fetching default packages from ${url} (branch: ${resolvedBranch})...`,

0 commit comments

Comments
 (0)