Log if retained workspace option is present for testing
parent
995f794dc4
commit
382c7eca85
|
|
@ -4341,7 +4341,9 @@ class CloudRunnerFolders {
|
||||||
}
|
}
|
||||||
// Only the following paths that do not start a path.join with another "Full" suffixed property need to start with an absolute /
|
// Only the following paths that do not start a path.join with another "Full" suffixed property need to start with an absolute /
|
||||||
static get uniqueCloudRunnerJobFolderAbsolute() {
|
static get uniqueCloudRunnerJobFolderAbsolute() {
|
||||||
return path_1.default.join(`/`, CloudRunnerFolders.buildVolumeFolder, cloud_runner_1.default.buildParameters.buildGuid);
|
return process.env.LOCKED_WORKSPACE === undefined
|
||||||
|
? path_1.default.join(`/`, CloudRunnerFolders.buildVolumeFolder, cloud_runner_1.default.buildParameters.buildGuid)
|
||||||
|
: path_1.default.join(`/`, CloudRunnerFolders.buildVolumeFolder, process.env.LOCKED_WORKSPACE);
|
||||||
}
|
}
|
||||||
static get cacheFolderFull() {
|
static get cacheFolderFull() {
|
||||||
return path_1.default.join('/', CloudRunnerFolders.buildVolumeFolder, CloudRunnerFolders.cacheFolder, cloud_runner_1.default.buildParameters.cacheKey);
|
return path_1.default.join('/', CloudRunnerFolders.buildVolumeFolder, CloudRunnerFolders.cacheFolder, cloud_runner_1.default.buildParameters.cacheKey);
|
||||||
|
|
@ -5112,6 +5114,7 @@ class BuildAutomationWorkflow {
|
||||||
static setupCommands(builderPath) {
|
static setupCommands(builderPath) {
|
||||||
return `export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
|
return `export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
|
||||||
echo "game ci cloud runner clone"
|
echo "game ci cloud runner clone"
|
||||||
|
if [ -d ${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute)} ]; then echo "Retained Workspace Already Exists!"; fi
|
||||||
mkdir -p ${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute)}
|
mkdir -p ${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute)}
|
||||||
git clone -q -b ${cloud_runner_1.default.buildParameters.cloudRunnerBranch} ${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.unityBuilderRepoUrl)} "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute)}"
|
git clone -q -b ${cloud_runner_1.default.buildParameters.cloudRunnerBranch} ${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.unityBuilderRepoUrl)} "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute)}"
|
||||||
chmod +x ${builderPath}
|
chmod +x ${builderPath}
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -11,7 +11,9 @@ export class CloudRunnerFolders {
|
||||||
// Only the following paths that do not start a path.join with another "Full" suffixed property need to start with an absolute /
|
// Only the following paths that do not start a path.join with another "Full" suffixed property need to start with an absolute /
|
||||||
|
|
||||||
public static get uniqueCloudRunnerJobFolderAbsolute(): string {
|
public static get uniqueCloudRunnerJobFolderAbsolute(): string {
|
||||||
return path.join(`/`, CloudRunnerFolders.buildVolumeFolder, CloudRunner.buildParameters.buildGuid);
|
return process.env.LOCKED_WORKSPACE === undefined
|
||||||
|
? path.join(`/`, CloudRunnerFolders.buildVolumeFolder, CloudRunner.buildParameters.buildGuid)
|
||||||
|
: path.join(`/`, CloudRunnerFolders.buildVolumeFolder, process.env.LOCKED_WORKSPACE);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static get cacheFolderFull(): string {
|
public static get cacheFolderFull(): string {
|
||||||
|
|
|
||||||
|
|
@ -51,6 +51,8 @@ describe('Cloud Runner Retain Workspace', () => {
|
||||||
|
|
||||||
const build2ContainsCacheKey = results2.includes(buildParameter.cacheKey);
|
const build2ContainsCacheKey = results2.includes(buildParameter.cacheKey);
|
||||||
const build2ContainsBuildGuid1FromRetainedWorkspace = results2.includes(buildParameter.buildGuid);
|
const build2ContainsBuildGuid1FromRetainedWorkspace = results2.includes(buildParameter.buildGuid);
|
||||||
|
const build2ContainsRetainedWorkspacePhrase = results2.includes(`Retained Workspace:`);
|
||||||
|
const build2ContainsWorkspaceExistsAlreadyPhrase = results2.includes(`Retained Workspace Already Exists!`);
|
||||||
const build2ContainsBuildSucceeded = results2.includes(buildSucceededString);
|
const build2ContainsBuildSucceeded = results2.includes(buildSucceededString);
|
||||||
const build2NotContainsNoLibraryMessage = !results2.includes(libraryString);
|
const build2NotContainsNoLibraryMessage = !results2.includes(libraryString);
|
||||||
const build2NotContainsZeroLibraryCacheFilesMessage = !results2.includes(
|
const build2NotContainsZeroLibraryCacheFilesMessage = !results2.includes(
|
||||||
|
|
@ -61,6 +63,8 @@ describe('Cloud Runner Retain Workspace', () => {
|
||||||
);
|
);
|
||||||
|
|
||||||
expect(build2ContainsCacheKey).toBeTruthy();
|
expect(build2ContainsCacheKey).toBeTruthy();
|
||||||
|
expect(build2ContainsRetainedWorkspacePhrase).toBeTruthy();
|
||||||
|
expect(build2ContainsWorkspaceExistsAlreadyPhrase).toBeTruthy();
|
||||||
expect(build2ContainsBuildGuid1FromRetainedWorkspace).toBeTruthy();
|
expect(build2ContainsBuildGuid1FromRetainedWorkspace).toBeTruthy();
|
||||||
expect(build2ContainsBuildSucceeded).toBeTruthy();
|
expect(build2ContainsBuildSucceeded).toBeTruthy();
|
||||||
expect(build2NotContainsZeroLibraryCacheFilesMessage).toBeTruthy();
|
expect(build2NotContainsZeroLibraryCacheFilesMessage).toBeTruthy();
|
||||||
|
|
|
||||||
|
|
@ -120,6 +120,9 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
|
||||||
private static setupCommands(builderPath) {
|
private static setupCommands(builderPath) {
|
||||||
return `export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
|
return `export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
|
||||||
echo "game ci cloud runner clone"
|
echo "game ci cloud runner clone"
|
||||||
|
if [ -d ${CloudRunnerFolders.ToLinuxFolder(
|
||||||
|
CloudRunnerFolders.builderPathAbsolute,
|
||||||
|
)} ]; then echo "Retained Workspace Already Exists!"; fi
|
||||||
mkdir -p ${CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.builderPathAbsolute)}
|
mkdir -p ${CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.builderPathAbsolute)}
|
||||||
git clone -q -b ${CloudRunner.buildParameters.cloudRunnerBranch} ${CloudRunnerFolders.ToLinuxFolder(
|
git clone -q -b ${CloudRunner.buildParameters.cloudRunnerBranch} ${CloudRunnerFolders.ToLinuxFolder(
|
||||||
CloudRunnerFolders.unityBuilderRepoUrl,
|
CloudRunnerFolders.unityBuilderRepoUrl,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue