PR feedback

2026-06-14 20:16:48 -07:00 · 2025-12-05 18:08:29 +00:00
parent 69731babfc
commit 956b2e4324
8 changed files with 432 additions and 115 deletions
@@ -3861,6 +3861,7 @@ class KubernetesJobSpecFactory {
            backoffLimit: 0,
            template: {
                spec: {
+                    terminationGracePeriodSeconds: 90,
                    volumes: [
                        {
                            name: 'build-mount',
@@ -3979,19 +3980,40 @@ class KubernetesPods {
            if (conditions.length > 0) {
                errorDetails.push(`Conditions: ${JSON.stringify(conditions.map((c) => ({ type: c.type, status: c.status, reason: c.reason, message: c.message })), undefined, 2)}`);
            }
+            let containerExitCode;
+            let containerSucceeded = false;
            if (containerStatuses.length > 0) {
                containerStatuses.forEach((cs, idx) => {
                    if (cs.state?.waiting) {
                        errorDetails.push(`Container ${idx} (${cs.name}) waiting: ${cs.state.waiting.reason} - ${cs.state.waiting.message || ''}`);
                    }
                    if (cs.state?.terminated) {
-                        errorDetails.push(`Container ${idx} (${cs.name}) terminated: ${cs.state.terminated.reason} - ${cs.state.terminated.message || ''} (exit code: ${cs.state.terminated.exitCode})`);
+                        const exitCode = cs.state.terminated.exitCode;
+                        containerExitCode = exitCode;
+                        if (exitCode === 0) {
+                            containerSucceeded = true;
+                        }
+                        errorDetails.push(`Container ${idx} (${cs.name}) terminated: ${cs.state.terminated.reason} - ${cs.state.terminated.message || ''} (exit code: ${exitCode})`);
                    }
                });
            }
            if (events.length > 0) {
                errorDetails.push(`Recent events: ${JSON.stringify(events.slice(-5), undefined, 2)}`);
            }
+            // Check if only PreStopHook failed but container succeeded
+            const hasPreStopHookFailure = events.some((e) => e.reason === 'FailedPreStopHook');
+            if (containerSucceeded && containerExitCode === 0) {
+                // Container succeeded - PreStopHook failure is non-critical
+                if (hasPreStopHookFailure) {
+                    cloud_runner_logger_1.default.logWarning(`Pod ${podName} marked as Failed due to PreStopHook failure, but container exited successfully (exit code 0). This is non-fatal.`);
+                }
+                else {
+                    cloud_runner_logger_1.default.log(`Pod ${podName} container succeeded (exit code 0), but pod phase is Failed. Checking details...`);
+                }
+                cloud_runner_logger_1.default.log(`Pod details: ${errorDetails.join('\n')}`);
+                // Don't throw error - container succeeded, PreStopHook failure is non-critical
+                return false; // Pod is not running, but we don't treat it as a failure
+            }
            const errorMessage = `K8s pod failed\n${errorDetails.join('\n')}`;
            cloud_runner_logger_1.default.log(errorMessage);
            throw new Error(errorMessage);
@@ -6924,6 +6946,10 @@ class ContainerHookService {
            if (step.image === undefined) {
                step.image = `ubuntu`;
            }
+            // Ensure allowFailure defaults to false if not explicitly set
+            if (step.allowFailure === undefined) {
+                step.allowFailure = false;
+            }
        }
        if (object === undefined) {
            throw new Error(`Failed to parse ${steps}`);
@@ -7296,7 +7322,22 @@ class CustomWorkflow {
            // }
            for (const step of steps) {
                cloud_runner_logger_1.default.log(`Cloud Runner is running in custom job mode`);
-                output += await cloud_runner_1.default.Provider.runTaskInWorkflow(cloud_runner_1.default.buildParameters.buildGuid, step.image, step.commands, `/${cloud_runner_folders_1.CloudRunnerFolders.buildVolumeFolder}`, `/${cloud_runner_folders_1.CloudRunnerFolders.projectPathAbsolute}/`, environmentVariables, [...secrets, ...step.secrets]);
+                try {
+                    const stepOutput = await cloud_runner_1.default.Provider.runTaskInWorkflow(cloud_runner_1.default.buildParameters.buildGuid, step.image, step.commands, `/${cloud_runner_folders_1.CloudRunnerFolders.buildVolumeFolder}`, `/${cloud_runner_folders_1.CloudRunnerFolders.projectPathAbsolute}/`, environmentVariables, [...secrets, ...step.secrets]);
+                    output += stepOutput;
+                }
+                catch (error) {
+                    const allowFailure = step.allowFailure === true;
+                    const stepName = step.name || step.image || 'unknown';
+                    if (allowFailure) {
+                        cloud_runner_logger_1.default.logWarning(`Hook container "${stepName}" failed but allowFailure is true. Continuing build. Error: ${error?.message || error}`);
+                        // Continue to next step
+                    }
+                    else {
+                        cloud_runner_logger_1.default.log(`Hook container "${stepName}" failed and allowFailure is false (default). Stopping build.`);
+                        throw error;
+                    }
+                }
            }
            return output;
        }