Merge pull request #166 from aledbf/check-exit-code

fix(builder): if exit code from build pod is not 0 it must return an error

Author: aledbf

pkg/gitreceive/build.go

@@ -190,7 +190,24 @@ func build(conf *Config, s3Client *s3.S3, kubeClient *client.Client, builderKey,
 	if err != nil {
 		return fmt.Errorf("fetching builder logs (%s)", err)
 	}
-	log.Debug("size of logs streamed %v", size)
+	log.Debug("size of streamed logs %v", size)
+
+	// check the state and exit code of the build pod.
+	// if the code is not 0 return error
+	if err := waitForPodEnd(kubeClient, newPod.Namespace, newPod.Name, conf.BuilderPodTickDuration(), conf.BuilderPodWaitDuration()); err != nil {
+		return fmt.Errorf("error getting builder pod status (%s)", err)
+	}
+	buildPod, err := kubeClient.Pods(newPod.Namespace).Get(newPod.Name)
+	if err != nil {
+		return fmt.Errorf("error getting builder pod status (%s)", err)
+	}
+
+	for _, containerStatus := range buildPod.Status.ContainerStatuses {
+		state := containerStatus.State.Terminated
+		if state.ExitCode != 0 {
+			return fmt.Errorf("Stopping build.")
+		}
+	}
 
 	// poll the s3 server to ensure the slug exists
 	err = wait.PollImmediate(conf.ObjectStorageTickDuration(), conf.ObjectStorageWaitDuration(), func() (bool, error) {

pkg/gitreceive/k8s_util.go

@@ -147,6 +147,37 @@ func addEnvToPod(pod api.Pod, key, value string) {
 
 // waitForPod waits for a pod in state running or failed
 func waitForPod(c *client.Client, ns, podName string, interval, timeout time.Duration) error {
+	condition := func(pod *api.Pod) (bool, error) {
+		if pod.Status.Phase == api.PodRunning {
+			return true, nil
+		}
+		if pod.Status.Phase == api.PodFailed {
+			return true, fmt.Errorf("Giving up; pod went into failed status: \n%s", fmt.Sprintf("%#v", pod))
+		}
+		return false, nil
+	}
+
+	return waitForPodCondition(c, ns, podName, condition, interval, timeout)
+}
+
+// waitForPodEnd waits for a pod in state succeeded or failed
+func waitForPodEnd(c *client.Client, ns, podName string, interval, timeout time.Duration) error {
+	condition := func(pod *api.Pod) (bool, error) {
+		if pod.Status.Phase == api.PodSucceeded {
+			return true, nil
+		}
+		if pod.Status.Phase == api.PodFailed {
+			return true, nil
+		}
+		return false, nil
+	}
+
+	return waitForPodCondition(c, ns, podName, condition, interval, timeout)
+}
+
+// waitForPodCondition waits for a pod in state defined by a condition (func)
+func waitForPodCondition(c *client.Client, ns, podName string, condition func(pod *api.Pod) (bool, error),
+	interval, timeout time.Duration) error {
 	return wait.PollImmediate(interval, timeout, func() (bool, error) {
 		pod, err := c.Pods(ns).Get(podName)
 		if err != nil {
@@ -155,16 +186,6 @@ func waitForPod(c *client.Client, ns, podName string, interval, timeout time.Dur
 			}
 		}
 
-		condition := func(pod *api.Pod) (bool, error) {
-			if pod.Status.Phase == api.PodRunning {
-				return true, nil
-			}
-			if pod.Status.Phase == api.PodFailed {
-				return true, fmt.Errorf("Giving up; pod went into failed status: \n%s", fmt.Sprintf("%#v", pod))
-			}
-			return false, nil
-		}
-
 		done, err := condition(pod)
 		if done {
 			return true, nil