better named tests and log local-docker params
parent
ce6a47b3b6
commit
3861aac122
|
|
@ -4840,14 +4840,14 @@ class BuildAutomationWorkflow {
|
||||||
run(cloudRunnerStepState) {
|
run(cloudRunnerStepState) {
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
try {
|
try {
|
||||||
return yield BuildAutomationWorkflow.standardBuildAutomation(cloudRunnerStepState.image);
|
return yield BuildAutomationWorkflow.standardBuildAutomation(cloudRunnerStepState.image, cloudRunnerStepState);
|
||||||
}
|
}
|
||||||
catch (error) {
|
catch (error) {
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
static standardBuildAutomation(baseImage) {
|
static standardBuildAutomation(baseImage, cloudRunnerStepState) {
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
// TODO accept post and pre build steps as yaml files in the repo
|
// TODO accept post and pre build steps as yaml files in the repo
|
||||||
try {
|
try {
|
||||||
|
|
@ -4868,7 +4868,7 @@ class BuildAutomationWorkflow {
|
||||||
cloud_runner_logger_1.default.logLine('Starting build automation job');
|
cloud_runner_logger_1.default.logLine('Starting build automation job');
|
||||||
// eslint-disable-next-line no-unused-vars
|
// eslint-disable-next-line no-unused-vars
|
||||||
const workspace = (yield shared_workspace_locking_1.default.GetLockedWorkspace()) || cloud_runner_1.default.buildParameters.buildGuid;
|
const workspace = (yield shared_workspace_locking_1.default.GetLockedWorkspace()) || cloud_runner_1.default.buildParameters.buildGuid;
|
||||||
output += yield cloud_runner_1.default.Provider.runTask(cloud_runner_1.default.buildParameters.buildGuid, baseImage.toString(), BuildAutomationWorkflow.BuildWorkflow, `/${cloud_runner_folders_1.CloudRunnerFolders.buildVolumeFolder}`, `/${cloud_runner_folders_1.CloudRunnerFolders.buildVolumeFolder}/`, cloud_runner_1.default.cloudRunnerEnvironmentVariables, cloud_runner_1.default.defaultSecrets);
|
output += yield cloud_runner_1.default.Provider.runTask(cloud_runner_1.default.buildParameters.buildGuid, baseImage.toString(), BuildAutomationWorkflow.BuildWorkflow, `/${cloud_runner_folders_1.CloudRunnerFolders.buildVolumeFolder}`, `/${cloud_runner_folders_1.CloudRunnerFolders.buildVolumeFolder}/`, [...cloud_runner_1.default.cloudRunnerEnvironmentVariables, ...cloudRunnerStepState.environment], [...cloud_runner_1.default.defaultSecrets, ...cloudRunnerStepState.secrets]);
|
||||||
if (!cloud_runner_1.default.buildParameters.isCliMode)
|
if (!cloud_runner_1.default.buildParameters.isCliMode)
|
||||||
core.endGroup();
|
core.endGroup();
|
||||||
cloud_runner_logger_1.default.logWithTime('Build time');
|
cloud_runner_logger_1.default.logWithTime('Build time');
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -13,13 +13,13 @@ import SharedWorkspaceLocking from '../../cli/shared-workspace-locking';
|
||||||
export class BuildAutomationWorkflow implements WorkflowInterface {
|
export class BuildAutomationWorkflow implements WorkflowInterface {
|
||||||
async run(cloudRunnerStepState: CloudRunnerStepState) {
|
async run(cloudRunnerStepState: CloudRunnerStepState) {
|
||||||
try {
|
try {
|
||||||
return await BuildAutomationWorkflow.standardBuildAutomation(cloudRunnerStepState.image);
|
return await BuildAutomationWorkflow.standardBuildAutomation(cloudRunnerStepState.image, cloudRunnerStepState);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static async standardBuildAutomation(baseImage: any) {
|
private static async standardBuildAutomation(baseImage: any, cloudRunnerStepState: CloudRunnerStepState) {
|
||||||
// TODO accept post and pre build steps as yaml files in the repo
|
// TODO accept post and pre build steps as yaml files in the repo
|
||||||
try {
|
try {
|
||||||
CloudRunnerLogger.log(`Cloud Runner is running standard build automation`);
|
CloudRunnerLogger.log(`Cloud Runner is running standard build automation`);
|
||||||
|
|
@ -46,8 +46,8 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
|
||||||
BuildAutomationWorkflow.BuildWorkflow,
|
BuildAutomationWorkflow.BuildWorkflow,
|
||||||
`/${CloudRunnerFolders.buildVolumeFolder}`,
|
`/${CloudRunnerFolders.buildVolumeFolder}`,
|
||||||
`/${CloudRunnerFolders.buildVolumeFolder}/`,
|
`/${CloudRunnerFolders.buildVolumeFolder}/`,
|
||||||
CloudRunner.cloudRunnerEnvironmentVariables,
|
[...CloudRunner.cloudRunnerEnvironmentVariables, ...cloudRunnerStepState.environment],
|
||||||
CloudRunner.defaultSecrets,
|
[...CloudRunner.defaultSecrets, ...cloudRunnerStepState.secrets],
|
||||||
);
|
);
|
||||||
if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
|
if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
|
||||||
CloudRunnerLogger.logWithTime('Build time');
|
CloudRunnerLogger.logWithTime('Build time');
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue