cleanup log groups

pull/310/head
Frostebite 2022-01-31 21:03:44 +00:00
parent f574b9cf68
commit 9b5de691a4
4 changed files with 8 additions and 5 deletions

5
dist/index.js vendored
View File

@ -1782,9 +1782,9 @@ class CloudRunner {
} }
static run(buildParameters, baseImage) { static run(buildParameters, baseImage) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
core.startGroup('Setup remote runner');
CloudRunner.setup(buildParameters); CloudRunner.setup(buildParameters);
try { try {
core.startGroup('Setup remote runner');
yield cloud_runner_state_1.CloudRunnerState.CloudRunnerProviderPlatform.setupSharedResources(cloud_runner_state_1.CloudRunnerState.buildParams.buildGuid, cloud_runner_state_1.CloudRunnerState.buildParams, cloud_runner_state_1.CloudRunnerState.branchName, cloud_runner_state_1.CloudRunnerState.defaultSecrets); yield cloud_runner_state_1.CloudRunnerState.CloudRunnerProviderPlatform.setupSharedResources(cloud_runner_state_1.CloudRunnerState.buildParams.buildGuid, cloud_runner_state_1.CloudRunnerState.buildParams, cloud_runner_state_1.CloudRunnerState.branchName, cloud_runner_state_1.CloudRunnerState.defaultSecrets);
core.endGroup(); core.endGroup();
const output = yield new workflow_composition_root_1.WorkflowCompositionRoot().run(new cloud_runner_step_state_1.CloudRunnerStepState(baseImage, task_parameter_serializer_1.TaskParameterSerializer.readBuildEnvironmentVariables(), cloud_runner_state_1.CloudRunnerState.defaultSecrets)); const output = yield new workflow_composition_root_1.WorkflowCompositionRoot().run(new cloud_runner_step_state_1.CloudRunnerStepState(baseImage, task_parameter_serializer_1.TaskParameterSerializer.readBuildEnvironmentVariables(), cloud_runner_state_1.CloudRunnerState.defaultSecrets));
@ -1795,6 +1795,7 @@ class CloudRunner {
return output; return output;
} }
catch (error) { catch (error) {
core.endGroup();
yield cloud_runner_error_1.CloudRunnerError.handleException(error); yield cloud_runner_error_1.CloudRunnerError.handleException(error);
throw error; throw error;
} }
@ -2035,7 +2036,7 @@ class Kubernetes {
defaultSecretsArray) { defaultSecretsArray) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
cloud_runner_logger_1.default.log(`deleting PVC`); cloud_runner_logger_1.default.log(`deleting PVC`);
this.kubeClient.deleteNamespacedPersistentVolumeClaim(this.pvcName, this.namespace); yield this.kubeClient.deleteNamespacedPersistentVolumeClaim(this.pvcName, this.namespace);
cloud_runner_logger_1.default.log(`deleted PVC`); cloud_runner_logger_1.default.log(`deleted PVC`);
}); });
} }

2
dist/index.js.map vendored

File diff suppressed because one or more lines are too long

View File

@ -35,9 +35,9 @@ class CloudRunner {
} }
static async run(buildParameters: BuildParameters, baseImage: string) { static async run(buildParameters: BuildParameters, baseImage: string) {
core.startGroup('Setup remote runner');
CloudRunner.setup(buildParameters); CloudRunner.setup(buildParameters);
try { try {
core.startGroup('Setup remote runner');
await CloudRunnerState.CloudRunnerProviderPlatform.setupSharedResources( await CloudRunnerState.CloudRunnerProviderPlatform.setupSharedResources(
CloudRunnerState.buildParams.buildGuid, CloudRunnerState.buildParams.buildGuid,
CloudRunnerState.buildParams, CloudRunnerState.buildParams,
@ -63,6 +63,7 @@ class CloudRunner {
core.endGroup(); core.endGroup();
return output; return output;
} catch (error) { } catch (error) {
core.endGroup();
await CloudRunnerError.handleException(error); await CloudRunnerError.handleException(error);
throw error; throw error;
} }

View File

@ -181,9 +181,10 @@ class Kubernetes implements CloudRunnerProviderInterface {
defaultSecretsArray: { ParameterKey: string; EnvironmentVariable: string; ParameterValue: string }[], defaultSecretsArray: { ParameterKey: string; EnvironmentVariable: string; ParameterValue: string }[],
) { ) {
CloudRunnerLogger.log(`deleting PVC`); CloudRunnerLogger.log(`deleting PVC`);
this.kubeClient.deleteNamespacedPersistentVolumeClaim(this.pvcName, this.namespace); await this.kubeClient.deleteNamespacedPersistentVolumeClaim(this.pvcName, this.namespace);
CloudRunnerLogger.log(`deleted PVC`); CloudRunnerLogger.log(`deleted PVC`);
} }
static async findPodFromJob(kubeClient: CoreV1Api, jobName: string, namespace: string) { static async findPodFromJob(kubeClient: CoreV1Api, jobName: string, namespace: string) {
const namespacedPods = await kubeClient.listNamespacedPod(namespace); const namespacedPods = await kubeClient.listNamespacedPod(namespace);
const pod = namespacedPods.body.items.find((x) => x.metadata?.labels?.['job-name'] === jobName); const pod = namespacedPods.body.items.find((x) => x.metadata?.labels?.['job-name'] === jobName);