Skip to content

Commit 2cca605

Browse files
Revert "chore: fix rhdh test/config path issue" (#12)
* Revert "chore: fix rhdh test/config path issue (#11)" This reverts commit 29dd4d3. * Update package.json
1 parent 29dd4d3 commit 2cca605

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "rhdh-e2e-test-utils",
3-
"version": "1.1.1",
3+
"version": "1.1.2",
44
"description": "Test utilities for RHDH E2E tests",
55
"license": "Apache-2.0",
66
"type": "module",

src/deployment/rhdh/deployment.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -263,29 +263,27 @@ export class RHDHDeployment {
263263
if (!method)
264264
throw new Error("Installation method (helm/operator) is required");
265265

266-
const configDir = `${import.meta.dirname}/tests/config`;
267-
268266
const base: DeploymentConfigBase = {
269267
version,
270268
namespace: input.namespace ?? this.deploymentConfig.namespace,
271269
auth: input.auth ?? "keycloak",
272-
appConfig: input.appConfig ?? `${configDir}/app-config-rhdh.yaml`,
273-
secrets: input.secrets ?? `${configDir}/rhdh-secrets.yaml`,
270+
appConfig: input.appConfig ?? `tests/config/app-config-rhdh.yaml`,
271+
secrets: input.secrets ?? `tests/config/rhdh-secrets.yaml`,
274272
dynamicPlugins:
275-
input.dynamicPlugins ?? `${configDir}/dynamic-plugins.yaml`,
273+
input.dynamicPlugins ?? `tests/config/dynamic-plugins.yaml`,
276274
};
277275

278276
if (method === "helm") {
279277
return {
280278
...base,
281279
method,
282-
valueFile: input.valueFile ?? `${configDir}/value_file.yaml`,
280+
valueFile: input.valueFile ?? `tests/config/value_file.yaml`,
283281
};
284282
} else if (method === "operator") {
285283
return {
286284
...base,
287285
method,
288-
subscription: input.subscription ?? `${configDir}/subscription.yaml`,
286+
subscription: input.subscription ?? `tests/config/subscription.yaml`,
289287
};
290288
} else {
291289
throw new Error(`Invalid RHDH installation method: ${method}`);

0 commit comments

Comments
 (0)