@@ -59,3 +59,19 @@ func hasBuildConfigAnnotation(build Build, annotationName, annotationValue strin

 	value, ok := build.Annotations[annotationName]

 	return ok && value == annotationValue

 }

+

+// FindTriggerPolicy retrieves the BuildTrigger(s) of a given type from a build configuration.

+// Returns nil if no matches are found.

+func FindTriggerPolicy(triggerType BuildTriggerType, config *BuildConfig) (buildTriggers []BuildTriggerPolicy) {

+	for _, specTrigger := range config.Spec.Triggers {

+		if specTrigger.Type == triggerType {

+			buildTriggers = append(buildTriggers, specTrigger)

+		}

+	}

+	return buildTriggers

+}

+

+func HasTriggerType(triggerType BuildTriggerType, bc *BuildConfig) bool {

+	matches := FindTriggerPolicy(triggerType, bc)

+	return len(matches) > 0

+}

@@ -42,13 +42,7 @@ type BuildConfigController struct {

 func (c *BuildConfigController) HandleBuildConfig(bc *buildapi.BuildConfig) error {

 	glog.V(4).Infof("Handling BuildConfig %s/%s", bc.Namespace, bc.Name)

-	hasChangeTrigger := false

-	for _, trigger := range bc.Spec.Triggers {

-		if trigger.Type == buildapi.ConfigChangeBuildTriggerType {

-			hasChangeTrigger = true

-			break

-		}

-	}

+	hasChangeTrigger := buildapi.HasTriggerType(buildapi.ConfigChangeBuildTriggerType, bc)

 	if !hasChangeTrigger {

 		return nil

@@ -50,12 +50,9 @@ func GitRefMatches(eventRef, configRef string, buildSource *buildapi.BuildSource

 // FindTriggerPolicy retrieves the BuildTrigger of a given type from a build

 // configuration

 func FindTriggerPolicy(triggerType buildapi.BuildTriggerType, config *buildapi.BuildConfig) (buildTriggers []buildapi.BuildTriggerPolicy, err error) {

-	err = ErrHookNotEnabled

-	for _, specTrigger := range config.Spec.Triggers {

-		if specTrigger.Type == triggerType {

-			buildTriggers = append(buildTriggers, specTrigger)

-			err = nil

-		}

+	buildTriggers = buildapi.FindTriggerPolicy(triggerType, config)

+	if len(buildTriggers) == 0 {

+		err = ErrHookNotEnabled

 	}

 	return buildTriggers, err

 }

@@ -20,6 +20,7 @@ import (

 	"github.com/spf13/cobra"

 	"github.com/spf13/pflag"

+	"k8s.io/client-go/1.4/pkg/util/wait"

 	"k8s.io/kubernetes/pkg/api"

 	"k8s.io/kubernetes/pkg/api/meta"

 	"k8s.io/kubernetes/pkg/api/unversioned"

@@ -463,14 +464,31 @@ func NewFactory(clientConfig kclientcmd.ClientConfig) *Factory {

 			if err != nil {

 				return nil, err

 			}

-			builds, err := oc.Builds(t.Namespace).List(api.ListOptions{})

-			if err != nil {

-				return nil, err

-			}

-			builds.Items = buildapi.FilterBuilds(builds.Items, buildapi.ByBuildConfigPredicate(t.Name))

+

+			hasConfigChangeTrigger := buildapi.HasTriggerType(buildapi.ConfigChangeBuildTriggerType, t)

+

+			var builds *buildapi.BuildList

+			err = wait.PollImmediate(time.Second, time.Minute, func() (bool, error) {

+				builds, err = oc.Builds(t.Namespace).List(api.ListOptions{})

+				if err != nil {

+					return false, err

+				}

+				builds.Items = buildapi.FilterBuilds(builds.Items, buildapi.ByBuildConfigPredicate(t.Name))

+				if len(builds.Items) > 0 || !hasConfigChangeTrigger {

+					return true, nil

+				}

+				// Wait for timeout before giving up on the first build from configchange trigger

+				return false, nil

+			})

+

 			if len(builds.Items) == 0 {

 				return nil, fmt.Errorf("no builds found for %q", t.Name)

 			}

+

+			if err != nil {

+				return nil, fmt.Errorf("error finding build for %q: %v", t.Name, err)

+			}

+

 			if bopts.Version != nil {

 				// If a version has been specified, try to get the logs from that build.

 				desired := buildutil.BuildNameForConfigVersion(t.Name, int(*bopts.Version))