clayton's changes

Author: bparees

pkg/build/apis/build/types.go

@@ -90,9 +90,6 @@ const (
 	// if the buildconfig does not specify a value.  This only applies to buildconfigs created
 	// via the new group api resource, not the legacy resource.
 	DefaultFailedBuildsHistoryLimit = int32(5)
-
-	// ExcerptLength is the maximum length of the LogSnippet on a build.
-	ExcerptLength = 5
 )
 
 var (

pkg/build/apis/build/v1/types.go

@@ -214,7 +214,7 @@ type BuildStatus struct {
 	// occured within each stage.
 	Stages []StageInfo `json:"stages,omitempty" protobuf:"bytes,11,opt,name=stages"`
 
-	// LogSnippet is the last few lines of the build log.  This value is only set for builds that failed.
+	// logSnippet is the last few lines of the build log.  This value is only set for builds that failed.
 	LogSnippet string `json:"logSnippet,omitempty" protobuf:"bytes,12,opt,name=logSnippet"`
 }
 

pkg/build/controller/build/build_controller.go

@@ -43,6 +43,9 @@ import (
 
 const (
 	maxRetries = 15
+
+	// maxExcerptLength is the maximum length of the LogSnippet on a build.
+	maxExcerptLength = 5
 )
 
 // BuildController watches builds and synchronizes them with their
@@ -634,13 +637,13 @@ func (bc *BuildController) updateBuild(build *buildapi.Build, update *buildUpdat
 // patchBuild generates a patch for the given build and buildUpdate
 // and applies that patch using the REST client
 func (bc *BuildController) patchBuild(build *buildapi.Build, update *buildUpdate) (*buildapi.Build, error) {
-
 	// Create a patch using the buildUpdate object
 	updatedBuild, err := buildutil.BuildDeepCopy(build)
 	if err != nil {
 		return nil, fmt.Errorf("cannot create a deep copy of build %s: %v", buildDesc(build), err)
 	}
 	update.apply(updatedBuild)
+
 	patch, err := validation.CreateBuildPatch(build, updatedBuild)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create a build patch: %v", err)
@@ -843,8 +846,8 @@ func setBuildCompletionData(build *buildapi.Build, pod *v1.Pod, update *buildUpd
 		if len(msg) != 0 {
 			parts := strings.Split(strings.TrimRight(msg, "\n"), "\n")
 
-			excerptLength := buildapi.ExcerptLength
-			if len(parts) < buildapi.ExcerptLength {
+			excerptLength := maxExcerptLength
+			if len(parts) < maxExcerptLength {
 				excerptLength = len(parts)
 			}
 			excerpt := parts[len(parts)-excerptLength:]

pkg/build/controller/build/build_controller_test.go

@@ -267,10 +267,15 @@ func TestHandleBuild(t *testing.T) {
 				update,
 		},
 		{
-			name:         "failed -> failed with completion timestamp",
-			build:        withCompletionTS(build(buildapi.BuildPhaseFailed)),
-			pod:          pod(v1.PodFailed),
-			expectUpdate: nil,
+			name:             "failed -> failed with completion timestamp+message",
+			build:            withCompletionTS(build(buildapi.BuildPhaseFailed)),
+			pod:              pod(v1.PodFailed),
+			expectOnComplete: true,
+			expectUpdate: newUpdate().
+				startTime(now).
+				completionTime(now).
+				logSnippet("").
+				update,
 		},
 	}
 
@@ -1188,6 +1193,11 @@ func (b *updateBuilder) podNameAnnotation(podName string) *updateBuilder {
 	return b
 }
 
+func (b *updateBuilder) logSnippet(message string) *updateBuilder {
+	b.update.setLogSnippet(message)
+	return b
+}
+
 type fakeRunPolicy struct {
 	notRunnable      bool
 	onCompleteCalled bool