Skip to content

Revert "chore: fix rhdh test/config path issue" #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
subhashkhileri merged 2 commits into from
Jan 6, 2026
Merged

Revert "chore: fix rhdh test/config path issue" #12

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81154aa
Revert "chore: fix rhdh test/config path issue (#11)"
subhashkhileri Jan 6, 2026
7c6f225
Update package.json
subhashkhileri Jan 6, 2026
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rhdh-e2e-test-utils",
"version": "1.1.1",
"version": "1.1.0",
Comment thread
subhashkhileri marked this conversation as resolved.
Outdated
"description": "Test utilities for RHDH E2E tests",
"license": "Apache-2.0",
"type": "module",
Expand Down
12 changes: 5 additions & 7 deletions src/deployment/rhdh/deployment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,29 +263,27 @@ export class RHDHDeployment {
if (!method)
throw new Error("Installation method (helm/operator) is required");

const configDir = `${import.meta.dirname}/tests/config`;

const base: DeploymentConfigBase = {
version,
namespace: input.namespace ?? this.deploymentConfig.namespace,
auth: input.auth ?? "keycloak",
appConfig: input.appConfig ?? `${configDir}/app-config-rhdh.yaml`,
secrets: input.secrets ?? `${configDir}/rhdh-secrets.yaml`,
appConfig: input.appConfig ?? `tests/config/app-config-rhdh.yaml`,
secrets: input.secrets ?? `tests/config/rhdh-secrets.yaml`,
dynamicPlugins:
input.dynamicPlugins ?? `${configDir}/dynamic-plugins.yaml`,
input.dynamicPlugins ?? `tests/config/dynamic-plugins.yaml`,
};

if (method === "helm") {
return {
...base,
method,
valueFile: input.valueFile ?? `${configDir}/value_file.yaml`,
valueFile: input.valueFile ?? `tests/config/value_file.yaml`,
};
} else if (method === "operator") {
return {
...base,
method,
subscription: input.subscription ?? `${configDir}/subscription.yaml`,
subscription: input.subscription ?? `tests/config/subscription.yaml`,
};
} else {
throw new Error(`Invalid RHDH installation method: ${method}`);
Expand Down