Use TimeMs names rather than tn
parent
01bccfcff2
commit
f90f963352
|
|
@ -1510,22 +1510,22 @@ class AWSBuildEnvironment {
|
||||||
const CF = new SDK.CloudFormation();
|
const CF = new SDK.CloudFormation();
|
||||||
cloud_runner_logger_1.default.log(`AWS Region: ${CF.config.region}`);
|
cloud_runner_logger_1.default.log(`AWS Region: ${CF.config.region}`);
|
||||||
const entrypoint = ['/bin/sh'];
|
const entrypoint = ['/bin/sh'];
|
||||||
const t0 = Date.now();
|
const startTimeMs = Date.now();
|
||||||
yield new aws_base_stack_1.AWSBaseStack(this.baseStackName).setupBaseStack(CF);
|
yield new aws_base_stack_1.AWSBaseStack(this.baseStackName).setupBaseStack(CF);
|
||||||
const taskDef = yield new aws_job_stack_1.AWSJobStack(this.baseStackName).setupCloudFormations(CF, buildId, image, entrypoint, commands, mountdir, workingdir, secrets);
|
const taskDef = yield new aws_job_stack_1.AWSJobStack(this.baseStackName).setupCloudFormations(CF, buildId, image, entrypoint, commands, mountdir, workingdir, secrets);
|
||||||
let t2;
|
let postRunTaskTimeMs;
|
||||||
try {
|
try {
|
||||||
const t1 = Date.now();
|
const postSetupStacksTimeMs = Date.now();
|
||||||
cloud_runner_logger_1.default.log(`Setup job time: ${Math.floor((t1 - t0) / 1000)}s`);
|
cloud_runner_logger_1.default.log(`Setup job time: ${Math.floor((postSetupStacksTimeMs - startTimeMs) / 1000)}s`);
|
||||||
yield aws_task_runner_1.default.runTask(taskDef, ECS, CF, environment, buildId, commands);
|
yield aws_task_runner_1.default.runTask(taskDef, ECS, CF, environment, buildId, commands);
|
||||||
t2 = Date.now();
|
postRunTaskTimeMs = Date.now();
|
||||||
cloud_runner_logger_1.default.log(`Run job time: ${Math.floor((t2 - t1) / 1000)}s`);
|
cloud_runner_logger_1.default.log(`Run job time: ${Math.floor((postRunTaskTimeMs - postSetupStacksTimeMs) / 1000)}s`);
|
||||||
}
|
}
|
||||||
finally {
|
finally {
|
||||||
yield this.cleanupResources(CF, taskDef);
|
yield this.cleanupResources(CF, taskDef);
|
||||||
const t3 = Date.now();
|
const postCleanupTimeMs = Date.now();
|
||||||
if (t2 !== undefined)
|
if (postRunTaskTimeMs !== undefined)
|
||||||
cloud_runner_logger_1.default.log(`Cleanup job time: ${Math.floor((t3 - t2) / 1000)}s`);
|
cloud_runner_logger_1.default.log(`Cleanup job time: ${Math.floor((postCleanupTimeMs - postRunTaskTimeMs) / 1000)}s`);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -51,7 +51,7 @@ class AWSBuildEnvironment implements CloudRunnerProviderInterface {
|
||||||
const CF = new SDK.CloudFormation();
|
const CF = new SDK.CloudFormation();
|
||||||
CloudRunnerLogger.log(`AWS Region: ${CF.config.region}`);
|
CloudRunnerLogger.log(`AWS Region: ${CF.config.region}`);
|
||||||
const entrypoint = ['/bin/sh'];
|
const entrypoint = ['/bin/sh'];
|
||||||
const t0 = Date.now();
|
const startTimeMs = Date.now();
|
||||||
|
|
||||||
await new AWSBaseStack(this.baseStackName).setupBaseStack(CF);
|
await new AWSBaseStack(this.baseStackName).setupBaseStack(CF);
|
||||||
const taskDef = await new AWSJobStack(this.baseStackName).setupCloudFormations(
|
const taskDef = await new AWSJobStack(this.baseStackName).setupCloudFormations(
|
||||||
|
|
@ -65,17 +65,18 @@ class AWSBuildEnvironment implements CloudRunnerProviderInterface {
|
||||||
secrets,
|
secrets,
|
||||||
);
|
);
|
||||||
|
|
||||||
let t2;
|
let postRunTaskTimeMs;
|
||||||
try {
|
try {
|
||||||
const t1 = Date.now();
|
const postSetupStacksTimeMs = Date.now();
|
||||||
CloudRunnerLogger.log(`Setup job time: ${Math.floor((t1 - t0) / 1000)}s`);
|
CloudRunnerLogger.log(`Setup job time: ${Math.floor((postSetupStacksTimeMs - startTimeMs) / 1000)}s`);
|
||||||
await AWSTaskRunner.runTask(taskDef, ECS, CF, environment, buildId, commands);
|
await AWSTaskRunner.runTask(taskDef, ECS, CF, environment, buildId, commands);
|
||||||
t2 = Date.now();
|
postRunTaskTimeMs = Date.now();
|
||||||
CloudRunnerLogger.log(`Run job time: ${Math.floor((t2 - t1) / 1000)}s`);
|
CloudRunnerLogger.log(`Run job time: ${Math.floor((postRunTaskTimeMs - postSetupStacksTimeMs) / 1000)}s`);
|
||||||
} finally {
|
} finally {
|
||||||
await this.cleanupResources(CF, taskDef);
|
await this.cleanupResources(CF, taskDef);
|
||||||
const t3 = Date.now();
|
const postCleanupTimeMs = Date.now();
|
||||||
if (t2 !== undefined) CloudRunnerLogger.log(`Cleanup job time: ${Math.floor((t3 - t2) / 1000)}s`);
|
if (postRunTaskTimeMs !== undefined)
|
||||||
|
CloudRunnerLogger.log(`Cleanup job time: ${Math.floor((postCleanupTimeMs - postRunTaskTimeMs) / 1000)}s`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue