Testing build fix

pkg/component/component.go

@@ -791,11 +791,8 @@ func Build(client *occlient.Client, componentName string, applicationName string
 		}
 
 		defer s.End(false)
-		if err := client.FollowBuildLog(buildName, stdout); err != nil {
-			return errors.Wrapf(err, "unable to follow logs for %s", buildName)
-		}
 
-		if err := client.WaitForBuildToFinish(buildName); err != nil {
+		if err := client.WaitForBuildToFinish(buildName, stdout); err != nil {
 			return errors.Wrapf(err, "unable to build %s, error: %s", buildName, b.String())
 		}
 		s.End(true)

pkg/occlient/occlient.go

@@ -89,6 +89,7 @@ type CreateArgs struct {
 
 const (
 	OcUpdateTimeout    = 5 * time.Minute
+	OcBuildTimeout     = 5 * time.Minute
 	OpenShiftNameSpace = "openshift"
 
 	// The length of the string to be generated for names of resources
@@ -1672,33 +1673,55 @@ func (c *Client) StartBuild(name string) (string, error) {
 }
 
 // WaitForBuildToFinish block and waits for build to finish. Returns error if build failed or was canceled.
-func (c *Client) WaitForBuildToFinish(buildName string) error {
+func (c *Client) WaitForBuildToFinish(buildName string, stdout io.Writer) error {
+	// following indicates if we have already setup the following logic
+	following := false
 	glog.V(4).Infof("Waiting for %s  build to finish", buildName)
 
+	// start a watch on the build resources and look for the given build name
 	w, err := c.buildClient.Builds(c.Namespace).Watch(metav1.ListOptions{
 		FieldSelector: fields.Set{"metadata.name": buildName}.AsSelector().String(),
 	})
 	if err != nil {
 		return errors.Wrapf(err, "unable to watch build")
 	}
 	defer w.Stop()
+	timeout := time.After(OcBuildTimeout)
 	for {
-		val, ok := <-w.ResultChan()
-		if !ok {
-			break
-		}
-		if e, ok := val.Object.(*buildv1.Build); ok {
-			glog.V(4).Infof("Status of %s build is %s", e.Name, e.Status.Phase)
-			switch e.Status.Phase {
-			case buildv1.BuildPhaseComplete:
-				glog.V(4).Infof("Build %s completed.", e.Name)
-				return nil
-			case buildv1.BuildPhaseFailed, buildv1.BuildPhaseCancelled, buildv1.BuildPhaseError:
-				return errors.Errorf("build %s status %s", e.Name, e.Status.Phase)
+		select {
+		// when a event is received regarding the given buildName
+		case val, ok := <-w.ResultChan():
+			if !ok {
+				break
 			}
+			// cast the object returned to a build object and check the phase of the build
+			if e, ok := val.Object.(*buildv1.Build); ok {
+				glog.V(4).Infof("Status of %s build is %s", e.Name, e.Status.Phase)
+				switch e.Status.Phase {
+				case buildv1.BuildPhaseComplete:
+					// the build is completed thus return
+					glog.V(4).Infof("Build %s completed.", e.Name)
+					return nil
+				case buildv1.BuildPhaseFailed, buildv1.BuildPhaseCancelled, buildv1.BuildPhaseError:
+					// the build failed/got cancelled/error occurred thus return with error
+					return errors.Errorf("build %s status %s", e.Name, e.Status.Phase)
+				case buildv1.BuildPhaseRunning:
+					// since the pod is ready and the build is now running, start following the logs
+					if !following {
+						// setting following to true as we need to set it up only once
+						following = true
+						err := c.FollowBuildLog(buildName, stdout)
+						if err != nil {
+							return err
+						}
+					}
+				}
+			}
+		case <-timeout:
+			// timeout has occurred while waiting for the build to start/complete, so error out
+			return errors.Errorf("timeout waiting for build %s to start", buildName)
 		}
 	}
-	return nil
 }
 
 // WaitAndGetDC block and waits until the DeploymentConfig has updated it's annotation
@@ -1845,6 +1868,7 @@ func (c *Client) FollowBuildLog(buildName string, stdout io.Writer) error {
 	}
 
 	rd, err := c.buildClient.RESTClient().Get().
+		Timeout(OcBuildTimeout).
 		Namespace(c.Namespace).
 		Resource("builds").
 		Name(buildName).

pkg/occlient/occlient_test.go

@@ -2091,7 +2091,7 @@ func TestWaitForBuildToFinish(t *testing.T) {
 				return true, fkWatch, nil
 			})
 
-			err := fkclient.WaitForBuildToFinish(tt.buildName)
+			err := fkclient.WaitForBuildToFinish(tt.buildName, os.Stdout)
 			if !tt.wantErr == (err != nil) {
 				t.Errorf(" client.WaitForBuildToFinish(string) unexpected error %v, wantErr %v", err, tt.wantErr)
 				return