Merge pull request #12873 from coreydaley/bugzilla_1415946_build_failure_reason_for_docker_build

Merged by openshift-bot

Author: OpenShift Bot

pkg/build/builder/common.go

@@ -193,7 +193,7 @@ func retryBuildStatusUpdate(build *api.Build, client client.BuildInterface, sour
 			latestBuild.Spec.Revision = sourceRev
 			latestBuild.ResourceVersion = ""
 		}
-
+		latestBuild.Status.Phase = build.Status.Phase
 		latestBuild.Status.Reason = build.Status.Reason
 		latestBuild.Status.Message = build.Status.Message
 		latestBuild.Status.Output.To = build.Status.Output.To

pkg/build/builder/docker.go

@@ -68,6 +68,7 @@ func (d *DockerBuilder) Build() error {
 	}
 	sourceInfo, err := fetchSource(d.dockerClient, buildDir, d.build, initialURLCheckTimeout, os.Stdin, d.gitClient)
 	if err != nil {
+		d.build.Status.Phase = api.BuildPhaseFailed
 		d.build.Status.Reason = api.StatusReasonFetchSourceFailed
 		d.build.Status.Message = api.StatusMessageFetchSourceFailed
 		handleBuildStatusUpdate(d.build, d.client, nil)
@@ -119,6 +120,7 @@ func (d *DockerBuilder) Build() error {
 			)
 			glog.V(0).Infof("\nPulling image %s ...", imageName)
 			if err = pullImage(d.dockerClient, imageName, pullAuthConfig); err != nil {
+				d.build.Status.Phase = api.BuildPhaseFailed
 				d.build.Status.Reason = api.StatusReasonPullBuilderImageFailed
 				d.build.Status.Message = api.StatusMessagePullBuilderImageFailed
 				handleBuildStatusUpdate(d.build, d.client, nil)
@@ -128,6 +130,7 @@ func (d *DockerBuilder) Build() error {
 	}
 
 	if err = d.dockerBuild(buildDir, buildTag, d.build.Spec.Source.Secrets); err != nil {
+		d.build.Status.Phase = api.BuildPhaseFailed
 		d.build.Status.Reason = api.StatusReasonDockerBuildFailed
 		d.build.Status.Message = api.StatusMessageDockerBuildFailed
 		handleBuildStatusUpdate(d.build, d.client, nil)
@@ -136,6 +139,7 @@ func (d *DockerBuilder) Build() error {
 
 	cname := containerName("docker", d.build.Name, d.build.Namespace, "post-commit")
 	if err := execPostCommitHook(d.dockerClient, d.build.Spec.PostCommit, buildTag, cname); err != nil {
+		d.build.Status.Phase = api.BuildPhaseFailed
 		d.build.Status.Reason = api.StatusReasonPostCommitHookFailed
 		d.build.Status.Message = api.StatusMessagePostCommitHookFailed
 		handleBuildStatusUpdate(d.build, d.client, nil)
@@ -164,6 +168,7 @@ func (d *DockerBuilder) Build() error {
 		glog.V(0).Infof("\nPushing image %s ...", pushTag)
 		digest, err := pushImage(d.dockerClient, pushTag, pushAuthConfig)
 		if err != nil {
+			d.build.Status.Phase = api.BuildPhaseFailed
 			d.build.Status.Reason = api.StatusReasonPushImageToRegistryFailed
 			d.build.Status.Message = api.StatusMessagePushImageToRegistryFailed
 			handleBuildStatusUpdate(d.build, d.client, nil)

pkg/build/builder/sti.go

@@ -116,6 +116,7 @@ func (s *S2IBuilder) Build() error {
 	// fetch source
 	sourceInfo, err := fetchSource(s.dockerClient, srcDir, s.build, initialURLCheckTimeout, os.Stdin, s.gitClient)
 	if err != nil {
+		s.build.Status.Phase = api.BuildPhaseFailed
 		s.build.Status.Reason = api.StatusReasonFetchSourceFailed
 		s.build.Status.Message = api.StatusMessageFetchSourceFailed
 		handleBuildStatusUpdate(s.build, s.client, nil)
@@ -254,6 +255,7 @@ func (s *S2IBuilder) Build() error {
 	glog.V(4).Infof("Creating a new S2I builder with build config: %#v\n", describe.Config(config))
 	builder, buildInfo, err := s.builder.Builder(config, s2ibuild.Overrides{Downloader: nil})
 	if err != nil {
+		s.build.Status.Phase = api.BuildPhaseFailed
 		s.build.Status.Reason, s.build.Status.Message = convertS2IFailureType(
 			buildInfo.FailureReason.Reason,
 			buildInfo.FailureReason.Message,
@@ -265,6 +267,7 @@ func (s *S2IBuilder) Build() error {
 	glog.V(4).Infof("Starting S2I build from %s/%s BuildConfig ...", s.build.Namespace, s.build.Name)
 	result, err := builder.Build(config)
 	if err != nil {
+		s.build.Status.Phase = api.BuildPhaseFailed
 		s.build.Status.Reason, s.build.Status.Message = convertS2IFailureType(
 			result.BuildInfo.FailureReason.Reason,
 			result.BuildInfo.FailureReason.Message,
@@ -276,6 +279,7 @@ func (s *S2IBuilder) Build() error {
 
 	cName := containerName("s2i", s.build.Name, s.build.Namespace, "post-commit")
 	if err = execPostCommitHook(s.dockerClient, s.build.Spec.PostCommit, buildTag, cName); err != nil {
+		s.build.Status.Phase = api.BuildPhaseFailed
 		s.build.Status.Reason = api.StatusReasonPostCommitHookFailed
 		s.build.Status.Message = api.StatusMessagePostCommitHookFailed
 		handleBuildStatusUpdate(s.build, s.client, nil)
@@ -306,6 +310,7 @@ func (s *S2IBuilder) Build() error {
 		glog.V(0).Infof("\nPushing image %s ...", pushTag)
 		digest, err := pushImage(s.dockerClient, pushTag, pushAuthConfig)
 		if err != nil {
+			s.build.Status.Phase = api.BuildPhaseFailed
 			s.build.Status.Reason = api.StatusReasonPushImageToRegistryFailed
 			s.build.Status.Message = api.StatusMessagePushImageToRegistryFailed
 			handleBuildStatusUpdate(s.build, s.client, nil)

pkg/build/controller/controller.go

@@ -302,55 +302,56 @@ func (bc *BuildPodController) HandlePod(pod *kapi.Pod) error {
 	nextStatus := build.Status.Phase
 	currentReason := build.Status.Reason
 
-	switch pod.Status.Phase {
-	case kapi.PodRunning:
-		// The pod's still running
-		build.Status.Reason = ""
-		build.Status.Message = ""
-		nextStatus = buildapi.BuildPhaseRunning
-
-	case kapi.PodPending:
-		build.Status.Reason = ""
-		build.Status.Message = ""
-		nextStatus = buildapi.BuildPhasePending
-		if secret := build.Spec.Output.PushSecret; secret != nil && currentReason != buildapi.StatusReasonMissingPushSecret {
-			if _, err := bc.SecretClient.Secrets(build.Namespace).Get(secret.Name); err != nil && errors.IsNotFound(err) {
-				build.Status.Reason = buildapi.StatusReasonMissingPushSecret
-				build.Status.Message = buildapi.StatusMessageMissingPushSecret
-				glog.V(4).Infof("Setting reason for pending build to %q due to missing secret %s/%s", build.Status.Reason, build.Namespace, secret.Name)
+	if build.Status.Phase != buildapi.BuildPhaseFailed {
+		switch pod.Status.Phase {
+		case kapi.PodRunning:
+			// The pod's still running
+			build.Status.Reason = ""
+			build.Status.Message = ""
+			nextStatus = buildapi.BuildPhaseRunning
+
+		case kapi.PodPending:
+			build.Status.Reason = ""
+			build.Status.Message = ""
+			nextStatus = buildapi.BuildPhasePending
+			if secret := build.Spec.Output.PushSecret; secret != nil && currentReason != buildapi.StatusReasonMissingPushSecret {
+				if _, err := bc.SecretClient.Secrets(build.Namespace).Get(secret.Name); err != nil && errors.IsNotFound(err) {
+					build.Status.Reason = buildapi.StatusReasonMissingPushSecret
+					build.Status.Message = buildapi.StatusMessageMissingPushSecret
+					glog.V(4).Infof("Setting reason for pending build to %q due to missing secret %s/%s", build.Status.Reason, build.Namespace, secret.Name)
+				}
 			}
-		}
 
-	case kapi.PodSucceeded:
-		build.Status.Reason = ""
-		build.Status.Message = ""
-		// Check the exit codes of all the containers in the pod
-		nextStatus = buildapi.BuildPhaseComplete
-		if len(pod.Status.ContainerStatuses) == 0 {
-			// no containers in the pod means something went badly wrong, so the build
-			// should be failed.
-			glog.V(2).Infof("Failing build %s/%s because the pod has no containers", build.Namespace, build.Name)
-			nextStatus = buildapi.BuildPhaseFailed
-		} else {
-			for _, info := range pod.Status.ContainerStatuses {
-				if info.State.Terminated != nil && info.State.Terminated.ExitCode != 0 {
-					nextStatus = buildapi.BuildPhaseFailed
-					break
+		case kapi.PodSucceeded:
+			build.Status.Reason = ""
+			build.Status.Message = ""
+			// Check the exit codes of all the containers in the pod
+			nextStatus = buildapi.BuildPhaseComplete
+			if len(pod.Status.ContainerStatuses) == 0 {
+				// no containers in the pod means something went badly wrong, so the build
+				// should be failed.
+				glog.V(2).Infof("Failing build %s/%s because the pod has no containers", build.Namespace, build.Name)
+				nextStatus = buildapi.BuildPhaseFailed
+			} else {
+				for _, info := range pod.Status.ContainerStatuses {
+					if info.State.Terminated != nil && info.State.Terminated.ExitCode != 0 {
+						nextStatus = buildapi.BuildPhaseFailed
+						break
+					}
 				}
 			}
-		}
 
-	case kapi.PodFailed:
-		nextStatus = buildapi.BuildPhaseFailed
+		case kapi.PodFailed:
+			nextStatus = buildapi.BuildPhaseFailed
 
-	default:
-		build.Status.Reason = ""
-		build.Status.Message = ""
+		default:
+			build.Status.Reason = ""
+			build.Status.Message = ""
+		}
 	}
-
 	// Update the build object when it progress to a next state or the reason for
 	// the current state changed.
-	if (!hasBuildPodNameAnnotation(build) || build.Status.Phase != nextStatus) && !buildutil.IsBuildComplete(build) {
+	if (!hasBuildPodNameAnnotation(build) || build.Status.Phase != nextStatus || build.Status.Phase == buildapi.BuildPhaseFailed) && !buildutil.IsBuildComplete(build) {
 		setBuildPodNameAnnotation(build, pod.Name)
 		reason := ""
 		if len(build.Status.Reason) > 0 {

pkg/build/registry/build/strategy.go

@@ -94,11 +94,13 @@ type detailsStrategy struct {
 func (detailsStrategy) PrepareForUpdate(ctx kapi.Context, obj, old runtime.Object) {
 	newBuild := obj.(*api.Build)
 	oldBuild := old.(*api.Build)
+	phase := newBuild.Status.Phase
 	revision := newBuild.Spec.Revision
 	message := newBuild.Status.Message
 	reason := newBuild.Status.Reason
 	outputTo := newBuild.Status.Output.To
 	*newBuild = *oldBuild
+	newBuild.Status.Phase = phase
 	newBuild.Spec.Revision = revision
 	newBuild.Status.Reason = reason
 	newBuild.Status.Message = message