Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion docs/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
13 changes: 2 additions & 11 deletions src/utils/plugin-metadata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;
Expand All @@ -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})...`,
Expand Down
Loading