diff --git a/.github/release.yml b/.github/release.yml index 716bb75da..76591a8a3 100644 --- a/.github/release.yml +++ b/.github/release.yml @@ -4,7 +4,7 @@ changelog: - ci - chore - dependencies - - refactor + - refactoring - test categories: - title: Breaking Changes diff --git a/packages/transport/test/testHelpers/TestUtil.ts b/packages/transport/test/testHelpers/TestUtil.ts index 5611dc1ef..23f9c988b 100644 --- a/packages/transport/test/testHelpers/TestUtil.ts +++ b/packages/transport/test/testHelpers/TestUtil.ts @@ -656,17 +656,20 @@ export class TestUtil { } public static async runDeletionJob(): Promise { - const backboneVersion = this.getBackboneEnvVar("BACKBONE_VERSION"); + const backboneVersion = this.getBackboneVersion(); + const appsettingsOverrideLocation = process.env.APPSETTINGS_OVERRIDE_LOCATION ?? `${__dirname}/../../../../.dev/appsettings.override.json`; await new GenericContainer(`ghcr.io/nmshd/backbone-identity-deletion-jobs:${backboneVersion}`) .withWaitStrategy(Wait.forOneShotStartup()) .withCommand(["--Worker", "ActualDeletionWorker"]) .withNetworkMode("backbone") - .withCopyFilesToContainer([{ source: `${__dirname}/../../../../.dev/appsettings.override.json`, target: "/app/appsettings.override.json" }]) + .withCopyFilesToContainer([{ source: appsettingsOverrideLocation, target: "/app/appsettings.override.json" }]) .start(); } - private static getBackboneEnvVar(name: string) { + private static getBackboneVersion() { + if (process.env.BACKBONE_VERSION) return process.env.BACKBONE_VERSION; + const envFile = fs.readFileSync(path.resolve(`${__dirname}/../../../../.dev/compose.backbone.env`)); const env = envFile .toString() @@ -674,6 +677,6 @@ export class TestUtil { .map((line) => line.split("=")) .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {} as Record); - return env[name]; + return env["BACKBONE_VERSION"]; } }