Skip to content

Commit 8a131b6

Browse files
fix: fetch default.packages.yaml from rhdh-plugin-export-overlays for all branches (#113)
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
1 parent c21003d commit 8a131b6

3 files changed

Lines changed: 10 additions & 13 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.45] - Current
5+
## [1.10.0] - Current
6+
7+
### Fixed
8+
9+
- **`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).
10+
11+
## [1.1.45]
612

713
### Fixed
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.45",
3+
"version": "1.10.0",
44
"description": "Test utilities for RHDH E2E tests",
55
"license": "Apache-2.0",
66
"repository": {

src/utils/plugin-metadata.ts

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,6 @@ export function isNightlyJob(): boolean {
8080
const DEFAULT_PACKAGES_BASE_URL =
8181
"https://raw.githubusercontent.com/redhat-developer/rhdh-plugin-export-overlays/refs/heads";
8282

83-
// release-1.10 still hosts default.packages.yaml in the rhdh repo (pre-migration)
84-
const LEGACY_DEFAULT_PACKAGES_BASE_URL =
85-
"https://raw.githubusercontent.com/redhat-developer/rhdh/refs/heads";
86-
8783
const DEFAULT_DPDY_OCI_REGISTRY = "registry.access.redhat.com/rhdh";
8884

8985
interface DefaultPackagesYaml {
@@ -100,8 +96,7 @@ interface DefaultPackagesYaml {
10096
* {{inherit}} tag resolution vs which need full OCI refs from metadata.
10197
*
10298
* Branch is determined by RELEASE_BRANCH_NAME (set by OpenShift CI),
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.
99+
* defaulting to "main" for local development.
105100
*/
106101
export async function fetchDefaultPackages(): Promise<Set<string>> {
107102
const branch = process.env.RELEASE_BRANCH_NAME;
@@ -116,11 +111,7 @@ export async function fetchDefaultPackages(): Promise<Set<string>> {
116111
);
117112
}
118113
const resolvedBranch = branch || "main";
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`;
114+
const url = `${DEFAULT_PACKAGES_BASE_URL}/${resolvedBranch}/default.packages.yaml`;
124115

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

0 commit comments

Comments
 (0)