actions
/
unity-builder
mirror of https://github.com/game-ci/unity-builder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve locking naming

pull/524/head
Frostebite 2023-03-20 01:24:15 +00:00
parent 5ea758fc9e
commit 937de0f338
8 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/cloud-runner-pipeline.yml vendored
View File

@ -49,7 +49,7 @@ jobs:
- 'cloud-runner-hooks' - 'cloud-runner-hooks'
- 'cloud-runner-local-persistence' - 'cloud-runner-local-persistence'
- 'cloud-runner-locking' - 'cloud-runner-locking'
- 'cloud-runner-locking-upsert' - 'cloud-runner-locking-get-locked'
providerStrategy: providerStrategy:
# - aws # - aws
- local-docker - local-docker
@ -107,7 +107,7 @@ jobs:
- 'cloud-runner-s3-steps' - 'cloud-runner-s3-steps'
#- 'cloud-runner-local-persistence' #- 'cloud-runner-local-persistence'
# - 'cloud-runner-locking' # - 'cloud-runner-locking'
#- 'cloud-runner-locking-upsert' #- 'cloud-runner-locking-get-locked'
providerStrategy: providerStrategy:
- aws - aws
- local-docker - local-docker

4
dist/index.js vendored
View File

@ -1052,7 +1052,7 @@ class CloudRunner {
try { try {
if (__1.BuildParameters.useRetainedWorkspaceMode(buildParameters)) { if (__1.BuildParameters.useRetainedWorkspaceMode(buildParameters)) {
CloudRunner.lockedWorkspace = shared_workspace_locking_1.default.NewWorkspaceName(); CloudRunner.lockedWorkspace = shared_workspace_locking_1.default.NewWorkspaceName();
const result = await shared_workspace_locking_1.default.GetOrCreateLockedWorkspace(CloudRunner.lockedWorkspace, CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters); const result = await shared_workspace_locking_1.default.GetLockedWorkspace(CloudRunner.lockedWorkspace, CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters);
if (result) { if (result) {
cloud_runner_logger_1.default.logLine(`Using retained workspace ${CloudRunner.lockedWorkspace}`); cloud_runner_logger_1.default.logLine(`Using retained workspace ${CloudRunner.lockedWorkspace}`);
CloudRunner.cloudRunnerEnvironmentVariables = [ CloudRunner.cloudRunnerEnvironmentVariables = [
@ -5325,7 +5325,7 @@ class SharedWorkspaceLocking {
.map((x) => x.replace(`/`, ``)) .map((x) => x.replace(`/`, ``))
.filter((x) => x.includes(workspace) && x.endsWith(`_lock`)); .filter((x) => x.includes(workspace) && x.endsWith(`_lock`));
} }
static async GetOrCreateLockedWorkspace(workspace, runId, buildParametersContext) { static async GetLockedWorkspace(workspace, runId, buildParametersContext) {
if (!build_parameters_1.default.useRetainedWorkspaceMode(buildParametersContext)) { if (!build_parameters_1.default.useRetainedWorkspaceMode(buildParametersContext)) {
return false; return false;
} }

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
src/model/cloud-runner/cloud-runner.ts
View File

@ -94,7 +94,7 @@ class CloudRunner {
if (BuildParameters.useRetainedWorkspaceMode(buildParameters)) { if (BuildParameters.useRetainedWorkspaceMode(buildParameters)) {
CloudRunner.lockedWorkspace = SharedWorkspaceLocking.NewWorkspaceName(); CloudRunner.lockedWorkspace = SharedWorkspaceLocking.NewWorkspaceName();
const result = await SharedWorkspaceLocking.GetOrCreateLockedWorkspace( const result = await SharedWorkspaceLocking.GetLockedWorkspace(
CloudRunner.lockedWorkspace, CloudRunner.lockedWorkspace,
CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters.buildGuid,
CloudRunner.buildParameters, CloudRunner.buildParameters,

6
src/model/cloud-runner/services/shared-workspace-locking.ts
View File

@ -62,11 +62,7 @@ export class SharedWorkspaceLocking {
.map((x) => x.replace(`/`, ``)) .map((x) => x.replace(`/`, ``))
.filter((x) => x.includes(workspace) && x.endsWith(`_lock`)); .filter((x) => x.includes(workspace) && x.endsWith(`_lock`));
} }
public static async GetOrCreateLockedWorkspace( public static async GetLockedWorkspace(workspace: string, runId: string, buildParametersContext: BuildParameters) {
workspace: string,
runId: string,
buildParametersContext: BuildParameters,
) {
if (!BuildParameters.useRetainedWorkspaceMode(buildParametersContext)) { if (!BuildParameters.useRetainedWorkspaceMode(buildParametersContext)) {
return false; return false;
} }

2
src/model/cloud-runner/tests/cloud-runner-local-persistence.test.ts
View File

@ -12,7 +12,7 @@ describe('Cloud Runner Local Docker Workflows', () => {
it('Responds', () => {}); it('Responds', () => {});
if (CloudRunnerOptions.providerStrategy === `local-docker`) { if (CloudRunnerOptions.providerStrategy === `local-docker`) {
it('inspect stateful folder of Workflows', async () => { it('inspect stateful folder of workflows', async () => {
const testValue = `the state in a job exits in the expected local-docker folder`; const testValue = `the state in a job exits in the expected local-docker folder`;
// Setup parameters // Setup parameters

38
src/model/cloud-runner/tests/cloud-runner-locking-upsert.test.ts → src/model/cloud-runner/tests/cloud-runner-locking-get-locked.test.ts
View File

@ -15,11 +15,11 @@ async function CreateParameters(overrides: any) {
return await BuildParameters.create(); return await BuildParameters.create();
} }
describe('Cloud Runner Locking Upsert', () => { describe('Cloud Runner Locking Get Locked Workspace', () => {
setups(); setups();
it('Responds', () => {}); it('Responds', () => {});
if (CloudRunnerOptions.cloudRunnerDebug) { if (CloudRunnerOptions.cloudRunnerDebug) {
it(`Get Or Create From No Workspace`, async () => { it(`Get locked workspace From No Workspace`, async () => {
const overrides: any = { const overrides: any = {
versioning: 'None', versioning: 'None',
projectPath: 'test-project', projectPath: 'test-project',
@ -33,11 +33,9 @@ describe('Cloud Runner Locking Upsert', () => {
const newWorkspaceName = `test-workspace-${uuidv4()}`; const newWorkspaceName = `test-workspace-${uuidv4()}`;
const runId = uuidv4(); const runId = uuidv4();
CloudRunner.buildParameters = buildParameters; CloudRunner.buildParameters = buildParameters;
expect( expect(await SharedWorkspaceLocking.GetLockedWorkspace(newWorkspaceName, runId, buildParameters)).toBeTruthy();
await SharedWorkspaceLocking.GetOrCreateLockedWorkspace(newWorkspaceName, runId, buildParameters),
).toBeTruthy();
}, 150000); }, 150000);
it(`Get Or Create From Unlocked`, async () => { it(`Get locked workspace from unlocked`, async () => {
const overrides: any = { const overrides: any = {
versioning: 'None', versioning: 'None',
projectPath: 'test-project', projectPath: 'test-project',
@ -52,12 +50,10 @@ describe('Cloud Runner Locking Upsert', () => {
const runId = uuidv4(); const runId = uuidv4();
CloudRunner.buildParameters = buildParameters; CloudRunner.buildParameters = buildParameters;
expect(await SharedWorkspaceLocking.CreateWorkspace(newWorkspaceName, buildParameters)).toBeTruthy(); expect(await SharedWorkspaceLocking.CreateWorkspace(newWorkspaceName, buildParameters)).toBeTruthy();
expect( expect(await SharedWorkspaceLocking.GetLockedWorkspace(newWorkspaceName, runId, buildParameters)).toBeTruthy();
await SharedWorkspaceLocking.GetOrCreateLockedWorkspace(newWorkspaceName, runId, buildParameters),
).toBeTruthy();
expect(CloudRunner.lockedWorkspace).toMatch(newWorkspaceName); expect(CloudRunner.lockedWorkspace).toMatch(newWorkspaceName);
}, 300000); }, 300000);
it(`Get Or Create From Locked`, async () => { it(`Get locked workspace from locked`, async () => {
const overrides: any = { const overrides: any = {
versioning: 'None', versioning: 'None',
projectPath: 'test-project', projectPath: 'test-project',
@ -78,12 +74,10 @@ describe('Cloud Runner Locking Upsert', () => {
expect(await SharedWorkspaceLocking.IsWorkspaceLocked(newWorkspaceName, buildParameters)).toBeTruthy(); expect(await SharedWorkspaceLocking.IsWorkspaceLocked(newWorkspaceName, buildParameters)).toBeTruthy();
expect(await SharedWorkspaceLocking.IsWorkspaceBelowMax(newWorkspaceName, buildParameters)).toBeTruthy(); expect(await SharedWorkspaceLocking.IsWorkspaceBelowMax(newWorkspaceName, buildParameters)).toBeTruthy();
expect(await SharedWorkspaceLocking.DoesWorkspaceExist(newWorkspaceName, buildParameters)).toBeTruthy(); expect(await SharedWorkspaceLocking.DoesWorkspaceExist(newWorkspaceName, buildParameters)).toBeTruthy();
expect( expect(await SharedWorkspaceLocking.GetLockedWorkspace(newWorkspaceName, runId2, buildParameters)).toBeTruthy();
await SharedWorkspaceLocking.GetOrCreateLockedWorkspace(newWorkspaceName, runId2, buildParameters),
).toBeTruthy();
expect(CloudRunner.lockedWorkspace).not.toMatch(newWorkspaceName); expect(CloudRunner.lockedWorkspace).not.toMatch(newWorkspaceName);
}, 300000); }, 300000);
it(`Get Or Create After Double Lock And One Unlock`, async () => { it(`Get locked workspace after double lock and one unlock`, async () => {
const overrides: any = { const overrides: any = {
versioning: 'None', versioning: 'None',
projectPath: 'test-project', projectPath: 'test-project',
@ -107,12 +101,10 @@ describe('Cloud Runner Locking Upsert', () => {
expect(await SharedWorkspaceLocking.HasWorkspaceLock(newWorkspaceName, runId, buildParameters)).toBeTruthy(); expect(await SharedWorkspaceLocking.HasWorkspaceLock(newWorkspaceName, runId, buildParameters)).toBeTruthy();
expect(await SharedWorkspaceLocking.IsWorkspaceLocked(newWorkspaceName, buildParameters)).toBeTruthy(); expect(await SharedWorkspaceLocking.IsWorkspaceLocked(newWorkspaceName, buildParameters)).toBeTruthy();
expect(await SharedWorkspaceLocking.DoesWorkspaceExist(newWorkspaceName, buildParameters)).toBeTruthy(); expect(await SharedWorkspaceLocking.DoesWorkspaceExist(newWorkspaceName, buildParameters)).toBeTruthy();
expect( expect(await SharedWorkspaceLocking.GetLockedWorkspace(newWorkspaceName, runId2, buildParameters)).toBeTruthy();
await SharedWorkspaceLocking.GetOrCreateLockedWorkspace(newWorkspaceName, runId2, buildParameters),
).toBeTruthy();
expect(CloudRunner.lockedWorkspace).not.toContain(newWorkspaceName); expect(CloudRunner.lockedWorkspace).not.toContain(newWorkspaceName);
}, 300000); }, 300000);
it(`Get Or Create After Double Lock And Unlock`, async () => { it(`Get locked workspace after double lock and unlock`, async () => {
const overrides: any = { const overrides: any = {
versioning: 'None', versioning: 'None',
projectPath: 'test-project', projectPath: 'test-project',
@ -137,12 +129,10 @@ describe('Cloud Runner Locking Upsert', () => {
expect(await SharedWorkspaceLocking.ReleaseWorkspace(newWorkspaceName, runId, buildParameters)).toBeTruthy(); expect(await SharedWorkspaceLocking.ReleaseWorkspace(newWorkspaceName, runId, buildParameters)).toBeTruthy();
expect(await SharedWorkspaceLocking.IsWorkspaceLocked(newWorkspaceName, buildParameters)).toBeFalsy(); expect(await SharedWorkspaceLocking.IsWorkspaceLocked(newWorkspaceName, buildParameters)).toBeFalsy();
expect(await SharedWorkspaceLocking.DoesWorkspaceExist(newWorkspaceName, buildParameters)).toBeTruthy(); expect(await SharedWorkspaceLocking.DoesWorkspaceExist(newWorkspaceName, buildParameters)).toBeTruthy();
expect( expect(await SharedWorkspaceLocking.GetLockedWorkspace(newWorkspaceName, runId2, buildParameters)).toBeTruthy();
await SharedWorkspaceLocking.GetOrCreateLockedWorkspace(newWorkspaceName, runId2, buildParameters),
).toBeTruthy();
expect(CloudRunner.lockedWorkspace).toContain(newWorkspaceName); expect(CloudRunner.lockedWorkspace).toContain(newWorkspaceName);
}, 300000); }, 300000);
it(`Get Or Create From Unlocked Was Locked`, async () => { it(`Get locked workspace from unlocked was locked`, async () => {
const overrides: any = { const overrides: any = {
versioning: 'None', versioning: 'None',
projectPath: 'test-project', projectPath: 'test-project',
@ -159,9 +149,7 @@ describe('Cloud Runner Locking Upsert', () => {
expect(await SharedWorkspaceLocking.CreateWorkspace(newWorkspaceName, buildParameters)).toBeTruthy(); expect(await SharedWorkspaceLocking.CreateWorkspace(newWorkspaceName, buildParameters)).toBeTruthy();
expect(await SharedWorkspaceLocking.LockWorkspace(newWorkspaceName, runId, buildParameters)).toBeTruthy(); expect(await SharedWorkspaceLocking.LockWorkspace(newWorkspaceName, runId, buildParameters)).toBeTruthy();
expect(await SharedWorkspaceLocking.ReleaseWorkspace(newWorkspaceName, runId, buildParameters)).toBeTruthy(); expect(await SharedWorkspaceLocking.ReleaseWorkspace(newWorkspaceName, runId, buildParameters)).toBeTruthy();
expect( expect(await SharedWorkspaceLocking.GetLockedWorkspace(newWorkspaceName, runId, buildParameters)).toBeTruthy();
await SharedWorkspaceLocking.GetOrCreateLockedWorkspace(newWorkspaceName, runId, buildParameters),
).toBeTruthy();
expect(CloudRunner.lockedWorkspace).toMatch(newWorkspaceName); expect(CloudRunner.lockedWorkspace).toMatch(newWorkspaceName);
}, 300000); }, 300000);
} }

4
src/model/cloud-runner/tests/e2e/cloud-runner-end2end-locking.test.ts
View File

@ -86,9 +86,7 @@ describe('Cloud Runner Locking', () => {
).toBeTruthy(); ).toBeTruthy();
await SharedWorkspaceLocking.CleanupWorkspace(newWorkspaceName, buildParameters); await SharedWorkspaceLocking.CleanupWorkspace(newWorkspaceName, buildParameters);
CloudRunnerLogger.log(`Starting get or create`); CloudRunnerLogger.log(`Starting get or create`);
expect( expect(await SharedWorkspaceLocking.GetLockedWorkspace(newWorkspaceName, runId, buildParameters)).toBeTruthy();
await SharedWorkspaceLocking.GetOrCreateLockedWorkspace(newWorkspaceName, runId, buildParameters),
).toBeTruthy();
}, 350000); }, 350000);
} }
}); });