diff --git a/src/model/cloud-runner/services/shared-workspace-locking.ts b/src/model/cloud-runner/services/shared-workspace-locking.ts index 5e910394..2a6b7ebe 100644 --- a/src/model/cloud-runner/services/shared-workspace-locking.ts +++ b/src/model/cloud-runner/services/shared-workspace-locking.ts @@ -5,10 +5,10 @@ import CloudRunnerOptions from '../cloud-runner-options'; import BuildParameters from '../../build-parameters'; import CloudRunner from '../cloud-runner'; export class SharedWorkspaceLocking { - private static get workspaceBucketRoot() { + public static get workspaceBucketRoot() { return `s3://${CloudRunner.buildParameters.awsBaseStackName}/`; } - private static get workspaceRoot() { + public static get workspaceRoot() { return `${SharedWorkspaceLocking.workspaceBucketRoot}locks/`; } public static async GetAllWorkspaces(buildParametersContext: BuildParameters): Promise { @@ -281,7 +281,7 @@ export class SharedWorkspaceLocking { ); } - private static async ReadLines(command: string): Promise { + public static async ReadLines(command: string): Promise { return CloudRunnerSystem.RunAndReadLines(command); } } diff --git a/src/model/cloud-runner/tests/cloud-runner-local-docker-persistence.test.ts b/src/model/cloud-runner/tests/cloud-runner-local-docker-persistence.test.ts index 930e972e..9b17b47e 100644 --- a/src/model/cloud-runner/tests/cloud-runner-local-docker-persistence.test.ts +++ b/src/model/cloud-runner/tests/cloud-runner-local-docker-persistence.test.ts @@ -6,7 +6,6 @@ import setups from './cloud-runner-suite.test'; import fs from 'fs'; import { CreateParameters } from './create-test-parameter'; import CloudRunnerLogger from '../services/cloud-runner-logger'; -import { CloudRunnerSystem } from '../services/cloud-runner-system'; describe('Cloud Runner Local Docker Workflows', () => { setups(); @@ -15,7 +14,6 @@ describe('Cloud Runner Local Docker Workflows', () => { if (CloudRunnerOptions.cloudRunnerCluster === `local-docker`) { it('inspect stateful folder of Workflows', async () => { const testValue = `the state in a job exits in the expected local-docker folder`; - await CloudRunnerSystem.Run(`echo "${testValue}" >> ./cloud-runner-cache/test-in-state.txt`); // Setup parameters const buildParameter = await CreateParameters({ @@ -25,7 +23,7 @@ describe('Cloud Runner Local Docker Workflows', () => { customJob: ` - name: 'step 1' image: 'ubuntu' - commands: 'ls /data/ && cat /data/test-in-state.txt >> /data/test-out-state.txt' + commands: 'echo "${testValue}" >> /data/test-out-state.txt' `, }); const baseImage = new ImageTag(buildParameter); diff --git a/src/model/cloud-runner/tests/shared-workspace-locking.test.ts b/src/model/cloud-runner/tests/shared-workspace-locking.test.ts index a4f39c7f..8ac2c5ad 100644 --- a/src/model/cloud-runner/tests/shared-workspace-locking.test.ts +++ b/src/model/cloud-runner/tests/shared-workspace-locking.test.ts @@ -44,6 +44,13 @@ describe('Cloud Runner Locking', () => { CloudRunnerLogger.log( await (await SharedWorkspaceLocking.GetAllLocks(newWorkspaceName, buildParameters)).join(`,`), ); + CloudRunnerLogger.log( + ( + await SharedWorkspaceLocking.ReadLines( + `aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParameters.cacheKey}/`, + ) + ).join(`,`), + ); const isExpectedLockedAfterLocking = (await SharedWorkspaceLocking.IsWorkspaceLocked(newWorkspaceName, buildParameters)) === true; expect(isExpectedLockedAfterLocking).toBeTruthy();