@@ -17512,6 +17512,10 @@

       },

       "description": "triggers determine how new Builds can be launched from a BuildConfig. If no triggers are defined, a new build can only occur as a result of an explicit client build creation."

      },

+     "runPolicy": {

+      "type": "string",

+      "description": "RunPolicy describes how the new build created from this build configuration will be scheduled for execution. This is optional, if not specified we default to \"Serial\"."

+     },

      "serviceAccount": {

       "type": "string",

       "description": "serviceAccount is the name of the ServiceAccount to use to run the pod created by this build. The pod will be allowed to use secrets referenced by the ServiceAccount"

@@ -770,6 +770,7 @@ func deepCopy_api_BuildConfigSpec(in buildapi.BuildConfigSpec, out *buildapi.Bui

 	} else {

 		out.Triggers = nil

 	}

+	out.RunPolicy = in.RunPolicy

 	if err := deepCopy_api_BuildSpec(in.BuildSpec, &out.BuildSpec, c); err != nil {

 		return err

 	}

@@ -197,6 +197,10 @@ func fuzzInternalObject(t *testing.T, forVersion unversioned.GroupVersion, item

 				j.From.Kind = specs[c.Intn(len(specs))]

 			}

 		},

+		func(j *build.BuildConfigSpec, c fuzz.Continue) {

+			c.FuzzNoCustom(j)

+			j.RunPolicy = build.BuildRunPolicySerial

+		},

 		func(j *build.SourceBuildStrategy, c fuzz.Continue) {

 			c.FuzzNoCustom(j)

 			j.From.Kind = "ImageStreamTag"

@@ -1041,6 +1041,7 @@ func autoConvert_api_BuildConfigSpec_To_v1_BuildConfigSpec(in *buildapi.BuildCon

 	} else {

 		out.Triggers = nil

 	}

+	out.RunPolicy = v1.BuildRunPolicy(in.RunPolicy)

 	if err := Convert_api_BuildSpec_To_v1_BuildSpec(&in.BuildSpec, &out.BuildSpec, s); err != nil {

 		return err

 	}

@@ -1906,6 +1907,7 @@ func autoConvert_v1_BuildConfigSpec_To_api_BuildConfigSpec(in *v1.BuildConfigSpe

 	} else {

 		out.Triggers = nil

 	}

+	out.RunPolicy = buildapi.BuildRunPolicy(in.RunPolicy)

 	if err := Convert_v1_BuildSpec_To_api_BuildSpec(&in.BuildSpec, &out.BuildSpec, s); err != nil {

 		return err

 	}

@@ -790,6 +790,7 @@ func deepCopy_v1_BuildConfigSpec(in apiv1.BuildConfigSpec, out *apiv1.BuildConfi

 	} else {

 		out.Triggers = nil

 	}

+	out.RunPolicy = in.RunPolicy

 	if err := deepCopy_v1_BuildSpec(in.BuildSpec, &out.BuildSpec, c); err != nil {

 		return err

 	}

@@ -1049,6 +1049,7 @@ func autoConvert_api_BuildConfigSpec_To_v1beta3_BuildConfigSpec(in *buildapi.Bui

 	} else {

 		out.Triggers = nil

 	}

+	out.RunPolicy = v1beta3.BuildRunPolicy(in.RunPolicy)

 	if err := Convert_api_BuildSpec_To_v1beta3_BuildSpec(&in.BuildSpec, &out.BuildSpec, s); err != nil {

 		return err

 	}

@@ -1812,6 +1813,7 @@ func autoConvert_v1beta3_BuildConfigSpec_To_api_BuildConfigSpec(in *v1beta3.Buil

 	} else {

 		out.Triggers = nil

 	}

+	out.RunPolicy = buildapi.BuildRunPolicy(in.RunPolicy)

 	if err := Convert_v1beta3_BuildSpec_To_api_BuildSpec(&in.BuildSpec, &out.BuildSpec, s); err != nil {

 		return err

 	}

@@ -798,6 +798,7 @@ func deepCopy_v1beta3_BuildConfigSpec(in apiv1beta3.BuildConfigSpec, out *apiv1b

 	} else {

 		out.Triggers = nil

 	}

+	out.RunPolicy = in.RunPolicy

 	if err := deepCopy_v1beta3_BuildSpec(in.BuildSpec, &out.BuildSpec, c); err != nil {

 		return err

 	}

@@ -19,6 +19,8 @@ const (

 	BuildPodNameAnnotation = "openshift.io/build.pod-name"

 	// BuildLabel is the key of a Pod label whose value is the Name of a Build which is run.

 	BuildLabel = "openshift.io/build.name"

+	// BuildRunPolicyLabel represents the start policy used to to start the build.

+	BuildRunPolicyLabel = "openshift.io/build.start-policy"

 	// DefaultDockerLabelNamespace is the key of a Build label, whose values are build metadata.

 	DefaultDockerLabelNamespace = "io.openshift."

 	// OriginVersion is an environment variable key that indicates the version of origin that

@@ -30,6 +32,15 @@ const (

 	// DropCapabilities is an environment variable that contains a list of capabilities to drop when

 	// executing a Source build

 	DropCapabilities = "DROP_CAPS"

+	// BuildConfigLabel is the key of a Build label whose value is the ID of a BuildConfig

+	// on which the Build is based.

+	BuildConfigLabel = "openshift.io/build-config.name"

+	// BuildConfigLabelDeprecated was used as BuildConfigLabel before adding namespaces.

+	// We keep it for backward compatibility.

+	BuildConfigLabelDeprecated = "buildconfig"

+	// BuildConfigPausedAnnotation is an annotation that marks a BuildConfig as paused.

+	// New Builds cannot be instantiated from a paused BuildConfig.

+	BuildConfigPausedAnnotation = "openshift.io/build-config.paused"

 )

 // Build encapsulates the inputs needed to produce a new deployable image, as well as

@@ -545,18 +556,6 @@ type BuildOutput struct {

 	PushSecret *kapi.LocalObjectReference

 }

-const (

-	// BuildConfigLabel is the key of a Build label whose value is the ID of a BuildConfig

-	// on which the Build is based.

-	BuildConfigLabel = "openshift.io/build-config.name"

-	// BuildConfigLabelDeprecated was used as BuildConfigLabel before adding namespaces.

-	// We keep it for backward compatibility.

-	BuildConfigLabelDeprecated = "buildconfig"

-	// BuildConfigPausedAnnotation is an annotation that marks a BuildConfig as paused.

-	// New Builds cannot be instantiated from a paused BuildConfig.

-	BuildConfigPausedAnnotation = "openshift.io/build-config.paused"

-)

-

 // BuildConfig is a template which can be used to create new builds.

 type BuildConfig struct {

 	unversioned.TypeMeta

@@ -575,10 +574,34 @@ type BuildConfigSpec struct {

 	// are defined, a new build can only occur as a result of an explicit client build creation.

 	Triggers []BuildTriggerPolicy

+	// RunPolicy describes how the new build created from this build

+	// configuration will be scheduled for execution.

+	// This is optional, if not specified we default to "Serial".

+	RunPolicy BuildRunPolicy

+

 	// BuildSpec is the desired build specification

 	BuildSpec

 }

+// BuildRunPolicy defines the behaviour of how the new builds are executed

+// from the existing build configuration.

+type BuildRunPolicy string

+

+const (

+	// BuildRunPolicyParallel schedules new builds immediately after they are

+	// created. Builds will be executed in parallel.

+	BuildRunPolicyParallel BuildRunPolicy = "Parallel"

+

+	// BuildRunPolicySerial schedules new builds to execute in a sequence as

+	// they are created. Every build gets queued up and will execute when the

+	// previous build completes. This is the default policy.

+	BuildRunPolicySerial BuildRunPolicy = "Serial"

+

+	// BuildRunPolicySerialLatestOnly schedules only the latest build to execute,

+	// cancelling all the previously queued build.

+	BuildRunPolicySerialLatestOnly BuildRunPolicy = "SerialLatestOnly"

+)

+

 // BuildConfigStatus contains current state of the build config object.

 type BuildConfigStatus struct {

 	// LastVersion is used to inform about number of last triggered build.

@@ -218,6 +218,11 @@ func Convert_v1_BuildStrategy_To_api_BuildStrategy(in *BuildStrategy, out *newer

 func addConversionFuncs(scheme *runtime.Scheme) {

 	err := scheme.AddDefaultingFuncs(

+		func(config *BuildConfigSpec) {

+			if len(config.RunPolicy) == 0 {

+				config.RunPolicy = BuildRunPolicySerial

+			}

+		},

 		func(source *BuildSource) {

 			if (source != nil) && (source.Type == BuildSourceBinary) && (source.Binary == nil) {

 				source.Binary = &BinaryBuildSource{}

@@ -63,8 +63,9 @@ func (BuildConfigList) SwaggerDoc() map[string]string {

 }

 var map_BuildConfigSpec = map[string]string{

-	"":         "BuildConfigSpec describes when and how builds are created",

-	"triggers": "triggers determine how new Builds can be launched from a BuildConfig. If no triggers are defined, a new build can only occur as a result of an explicit client build creation.",

+	"":          "BuildConfigSpec describes when and how builds are created",

+	"triggers":  "triggers determine how new Builds can be launched from a BuildConfig. If no triggers are defined, a new build can only occur as a result of an explicit client build creation.",

+	"runPolicy": "RunPolicy describes how the new build created from this build configuration will be scheduled for execution. This is optional, if not specified we default to \"Serial\".",

 }

 func (BuildConfigSpec) SwaggerDoc() map[string]string {

@@ -546,10 +546,34 @@ type BuildConfigSpec struct {

 	// are defined, a new build can only occur as a result of an explicit client build creation.

 	Triggers []BuildTriggerPolicy `json:"triggers"`

+	// RunPolicy describes how the new build created from this build

+	// configuration will be scheduled for execution.

+	// This is optional, if not specified we default to "Serial".

+	RunPolicy BuildRunPolicy `json:"runPolicy,omitempty"`

+

 	// BuildSpec is the desired build specification

 	BuildSpec `json:",inline"`

 }

+// BuildRunPolicy defines the behaviour of how the new builds are executed

+// from the existing build configuration.

+type BuildRunPolicy string

+

+const (

+	// BuildRunPolicyParallel schedules new builds immediately after they are

+	// created. Builds will be executed in parallel.

+	BuildRunPolicyParallel BuildRunPolicy = "Parallel"

+

+	// BuildRunPolicySerial schedules new builds to execute in a sequence as

+	// they are created. Every build gets queued up and will execute when the

+	// previous build completes. This is the default policy.

+	BuildRunPolicySerial BuildRunPolicy = "Serial"

+

+	// BuildRunPolicySerialLatestOnly schedules only the latest build to execute,

+	// cancelling all the previously queued build.

+	BuildRunPolicySerialLatestOnly BuildRunPolicy = "SerialLatestOnly"

+)

+

 // BuildConfigStatus contains current state of the build config object.

 type BuildConfigStatus struct {

 	// lastVersion is used to inform about number of last triggered build.

@@ -220,6 +220,11 @@ func Convert_api_BuildStrategy_To_v1beta3_BuildStrategy(in *newer.BuildStrategy,

 func addConversionFuncs(scheme *runtime.Scheme) {

 	err := scheme.AddDefaultingFuncs(

+		func(config *BuildConfigSpec) {

+			if len(config.RunPolicy) == 0 {

+				config.RunPolicy = BuildRunPolicySerial

+			}

+		},

 		func(strategy *BuildStrategy) {

 			if (strategy != nil) && (strategy.Type == DockerBuildStrategyType) {

 				//  initialize DockerStrategy to a default state if it's not set.

@@ -510,9 +510,33 @@ type BuildConfigSpec struct {

 	// are defined, a new build can only occur as a result of an explicit client build creation.

 	Triggers []BuildTriggerPolicy `json:"triggers"`

+	// RunPolicy describes how the new build created from this build

+	// configuration will be scheduled for execution.

+	// This is optional, if not specified we default to "Serial".

+	RunPolicy BuildRunPolicy `json:"runPolicy,omitempty"`

+

 	BuildSpec `json:",inline"`

 }

+// BuildRunPolicy defines the behaviour of how the new builds are executed

+// from the existing build configuration.

+type BuildRunPolicy string

+

+const (

+	// BuildRunPolicyParallel schedules new builds immediately after they are

+	// created. Builds will be executed in parallel.

+	BuildRunPolicyParallel BuildRunPolicy = "Parallel"

+

+	// BuildRunPolicySerial schedules new builds to execute in a sequence as

+	// they are created. Every build gets queued up and will execute when the

+	// previous build completes. This is the default policy.

+	BuildRunPolicySerial BuildRunPolicy = "Serial"

+

+	// BuildRunPolicySerialLatestOnly schedules only the latest build to execute,

+	// cancelling all the previously queued build.

+	BuildRunPolicySerialLatestOnly BuildRunPolicy = "SerialLatestOnly"

+)

+

 // BuildConfigStatus contains current state of the build config object.

 type BuildConfigStatus struct {

 	// LastVersion is used to inform about number of last triggered build.

@@ -82,6 +82,13 @@ func ValidateBuildConfig(config *buildapi.BuildConfig) field.ErrorList {

 		fromRefs[fromKey] = struct{}{}

 	}

+	switch config.Spec.RunPolicy {

+	case buildapi.BuildRunPolicyParallel, buildapi.BuildRunPolicySerial, buildapi.BuildRunPolicySerialLatestOnly:

+	default:

+		allErrs = append(allErrs, field.Invalid(specPath.Child("runPolicy"), config.Spec.RunPolicy,

+			"run policy must Parallel, Serial, or SerialLatestOnly"))

+	}

+

 	allErrs = append(allErrs, validateBuildSpec(&config.Spec.BuildSpec, specPath)...)

 	return allErrs

@@ -137,6 +137,7 @@ func TestBuildConfigEmptySource(t *testing.T) {

 		{

 			ObjectMeta: kapi.ObjectMeta{Name: "config-id", Namespace: "namespace"},

 			Spec: buildapi.BuildConfigSpec{

+				RunPolicy: buildapi.BuildRunPolicySerial,

 				BuildSpec: buildapi.BuildSpec{

 					Source: buildapi.BuildSource{},

 					Strategy: buildapi.BuildStrategy{

@@ -159,6 +160,7 @@ func TestBuildConfigEmptySource(t *testing.T) {

 		{

 			ObjectMeta: kapi.ObjectMeta{Name: "config-id", Namespace: "namespace"},

 			Spec: buildapi.BuildConfigSpec{

+				RunPolicy: buildapi.BuildRunPolicySerial,

 				BuildSpec: buildapi.BuildSpec{

 					Source: buildapi.BuildSource{},

 					Strategy: buildapi.BuildStrategy{

@@ -188,6 +190,7 @@ func TestBuildConfigEmptySource(t *testing.T) {

 	badBuildConfig := buildapi.BuildConfig{

 		ObjectMeta: kapi.ObjectMeta{Name: "config-id", Namespace: "namespace"},

 		Spec: buildapi.BuildConfigSpec{

+			RunPolicy: buildapi.BuildRunPolicySerial,

 			BuildSpec: buildapi.BuildSpec{

 				Source: buildapi.BuildSource{},

 				Strategy: buildapi.BuildStrategy{

@@ -384,6 +387,7 @@ func TestBuildConfigGitSourceWithProxyFailure(t *testing.T) {

 	buildConfig := &buildapi.BuildConfig{

 		ObjectMeta: kapi.ObjectMeta{Name: "config-id", Namespace: "namespace"},

 		Spec: buildapi.BuildConfigSpec{

+			RunPolicy: buildapi.BuildRunPolicySerial,

 			BuildSpec: buildapi.BuildSpec{

 				Source: buildapi.BuildSource{

 					Git: &buildapi.GitBuildSource{

@@ -424,6 +428,7 @@ func TestBuildConfigDockerStrategyImageChangeTrigger(t *testing.T) {

 	buildConfig := &buildapi.BuildConfig{

 		ObjectMeta: kapi.ObjectMeta{Name: "config-id", Namespace: "namespace"},

 		Spec: buildapi.BuildConfigSpec{

+			RunPolicy: buildapi.BuildRunPolicySerial,

 			BuildSpec: buildapi.BuildSpec{

 				Source: buildapi.BuildSource{

 					Git: &buildapi.GitBuildSource{

@@ -467,6 +472,7 @@ func TestBuildConfigValidationFailureRequiredName(t *testing.T) {

 	buildConfig := &buildapi.BuildConfig{

 		ObjectMeta: kapi.ObjectMeta{Name: "", Namespace: "foo"},

 		Spec: buildapi.BuildConfigSpec{

+			RunPolicy: buildapi.BuildRunPolicySerial,

 			BuildSpec: buildapi.BuildSpec{

 				Source: buildapi.BuildSource{

 					Git: &buildapi.GitBuildSource{

@@ -738,6 +744,7 @@ func TestBuildConfigImageChangeTriggers(t *testing.T) {

 		buildConfig := &buildapi.BuildConfig{

 			ObjectMeta: kapi.ObjectMeta{Name: "bar", Namespace: "foo"},

 			Spec: buildapi.BuildConfigSpec{

+				RunPolicy: buildapi.BuildRunPolicySerial,

 				BuildSpec: buildapi.BuildSpec{

 					Source: buildapi.BuildSource{

 						Git: &buildapi.GitBuildSource{

@@ -782,6 +789,7 @@ func TestBuildConfigValidationOutputFailure(t *testing.T) {

 	buildConfig := &buildapi.BuildConfig{

 		ObjectMeta: kapi.ObjectMeta{Name: ""},

 		Spec: buildapi.BuildConfigSpec{

+			RunPolicy: buildapi.BuildRunPolicySerial,

 			BuildSpec: buildapi.BuildSpec{

 				Source: buildapi.BuildSource{

 					Git: &buildapi.GitBuildSource{

@@ -3,6 +3,7 @@ package client

 import (

 	buildapi "github.com/openshift/origin/pkg/build/api"

 	osclient "github.com/openshift/origin/pkg/client"

+	kapi "k8s.io/kubernetes/pkg/api"

 )

 // BuildConfigGetter provides methods for getting BuildConfigs

@@ -41,6 +42,11 @@ type BuildUpdater interface {

 	Update(namespace string, build *buildapi.Build) error

 }

+// BuildLister provides methods for listing the Builds.

+type BuildLister interface {

+	List(namespace string, opts kapi.ListOptions) (*buildapi.BuildList, error)

+}

+

 // OSClientBuildClient deletes build create and update operations to the OpenShift client interface

 type OSClientBuildClient struct {

 	Client osclient.Interface

@@ -57,6 +63,11 @@ func (c OSClientBuildClient) Update(namespace string, build *buildapi.Build) err

 	return e

 }

+// List lists the builds using the OpenShift client.

+func (c OSClientBuildClient) List(namespace string, opts kapi.ListOptions) (*buildapi.BuildList, error) {

+	return c.Client.Builds(namespace).List(opts)

+}

+

 // BuildCloner provides methods for cloning builds

 type BuildCloner interface {

 	Clone(namespace string, request *buildapi.BuildRequest) (*buildapi.Build, error)

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

 	buildapi "github.com/openshift/origin/pkg/build/api"

 	buildclient "github.com/openshift/origin/pkg/build/client"

+	"github.com/openshift/origin/pkg/build/controller/policy"

 	strategy "github.com/openshift/origin/pkg/build/controller/strategy"

 	buildutil "github.com/openshift/origin/pkg/build/util"

 	imageapi "github.com/openshift/origin/pkg/image/api"

@@ -21,10 +22,12 @@ import (

 // BuildController watches build resources and manages their state

 type BuildController struct {

 	BuildUpdater      buildclient.BuildUpdater

+	BuildLister       buildclient.BuildLister

 	PodManager        podManager

 	BuildStrategy     BuildStrategy

 	ImageStreamClient imageStreamClient

 	Recorder          record.EventRecorder

+	RunPolicies       []policy.RunPolicy

 }

 // BuildStrategy knows how to create a pod spec for a pod which can execute a build.

@@ -79,25 +82,42 @@ func (bc *BuildController) CancelBuild(build *buildapi.Build) error {

 // HandleBuild deletes pods for cancelled builds and takes new builds and puts

 // them in the pending state after creating a corresponding pod

 func (bc *BuildController) HandleBuild(build *buildapi.Build) error {

-	glog.V(4).Infof("Handling build %s/%s", build.Namespace, build.Name)

+	// these builds are processed/updated/etc by the jenkins sync plugin

+	if build.Spec.Strategy.JenkinsPipelineStrategy != nil {

+		glog.V(4).Infof("Ignoring build with jenkins pipeline strategy")

+		return nil

+	}

+	glog.V(4).Infof("Handling build %s/%s (%s)", build.Namespace, build.Name, build.Status.Phase)

+

+	runPolicy := policy.ForBuild(build, bc.RunPolicies)

+	if runPolicy == nil {

+		return fmt.Errorf("unable to determine build scheduler for %s/%s", build.Namespace, build.Name)

+	}

+

+	if buildutil.IsBuildComplete(build) {

+		if err := runPolicy.OnComplete(build); err != nil {

+			return err

+		}

+		return nil

+	}

 	// A cancelling event was triggered for the build, delete its pod and update build status.

 	if build.Status.Cancelled && build.Status.Phase != buildapi.BuildPhaseCancelled {

+		glog.V(5).Infof("Marking build %s/%s as cancelled", build.Namespace, build.Name)

 		if err := bc.CancelBuild(build); err != nil {

 			build.Status.Reason = buildapi.StatusReasonCancelBuildFailed

 			return fmt.Errorf("Failed to cancel build %s/%s: %v, will retry", build.Namespace, build.Name, err)

 		}

 	}

-	// these builds are processed/updated/etc by the jenkins sync plugin

-	if build.Spec.Strategy.JenkinsPipelineStrategy != nil {

-		glog.V(4).Infof("Ignoring build with jenkins pipeline strategy")

+	// Handle only new builds from this point

+	if build.Status.Phase != buildapi.BuildPhaseNew {

 		return nil

 	}

-	// Handle new builds

-	if build.Status.Phase != buildapi.BuildPhaseNew {

-		return nil

+	// The runPolicy decides whether to execute this build or not.

+	if run, err := runPolicy.IsRunnable(build); err != nil || !run {

+		return err

 	}

 	if err := bc.nextBuildPhase(build); err != nil {

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

 	buildapi "github.com/openshift/origin/pkg/build/api"

 	buildclient "github.com/openshift/origin/pkg/build/client"

+	"github.com/openshift/origin/pkg/build/controller/policy"

 	buildtest "github.com/openshift/origin/pkg/build/controller/test"

 	imageapi "github.com/openshift/origin/pkg/image/api"

 )

@@ -22,6 +23,12 @@ func (okc *okBuildUpdater) Update(namespace string, build *buildapi.Build) error

 	return nil

 }

+type okBuildLister struct{}

+

+func (okc *okBuildLister) List(namespace string, opts kapi.ListOptions) (*buildapi.BuildList, error) {

+	return &buildapi.BuildList{Items: []buildapi.Build{}}, nil

+}

+

 type errBuildUpdater struct{}

 func (ec *errBuildUpdater) Update(namespace string, build *buildapi.Build) error {

@@ -115,6 +122,9 @@ func mockBuild(phase buildapi.BuildPhase, output buildapi.BuildOutput) *buildapi

 			Namespace: "namespace",

 			Labels: map[string]string{

 				"name": "dataBuild",

+				// TODO: Switch this test to use Serial policy

+				buildapi.BuildRunPolicyLabel: string(buildapi.BuildRunPolicyParallel),

+				buildapi.BuildConfigLabel:    "test-bc",

 			},

 		},

 		Spec: buildapi.BuildSpec{

@@ -138,10 +148,12 @@ func mockBuild(phase buildapi.BuildPhase, output buildapi.BuildOutput) *buildapi

 func mockBuildController() *BuildController {

 	return &BuildController{

 		BuildUpdater:      &okBuildUpdater{},

+		BuildLister:       &okBuildLister{},

 		PodManager:        &okPodManager{},

 		BuildStrategy:     &okStrategy{},

 		ImageStreamClient: &okImageStreamClient{},

 		Recorder:          &record.FakeRecorder{},

+		RunPolicies:       policy.GetAllRunPolicies(&okBuildLister{}, &okBuildUpdater{}),

 	}

 }

@@ -405,6 +417,9 @@ func TestHandleBuild(t *testing.T) {

 		if len(tc.outputSpec) != 0 {

 			build := ctrl.BuildStrategy.(*okStrategy).build

+			if build == nil {

+				t.Errorf("(%d) unable to cast build", i)

+			}

 			if build.Spec.Output.To.Name != tc.outputSpec {

 				t.Errorf("(%d) expected build sent to strategy to have docker spec %s, got %s", i, tc.outputSpec, build.Spec.Output.To.Name)

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

 	buildapi "github.com/openshift/origin/pkg/build/api"

 	buildclient "github.com/openshift/origin/pkg/build/client"

 	buildcontroller "github.com/openshift/origin/pkg/build/controller"

+	"github.com/openshift/origin/pkg/build/controller/policy"

 	strategy "github.com/openshift/origin/pkg/build/controller/strategy"

 	buildutil "github.com/openshift/origin/pkg/build/util"

 	osclient "github.com/openshift/origin/pkg/client"

@@ -63,6 +64,7 @@ type BuildControllerFactory struct {

 	OSClient            osclient.Interface

 	KubeClient          kclient.Interface

 	BuildUpdater        buildclient.BuildUpdater

+	BuildLister         buildclient.BuildLister

 	DockerBuildStrategy *strategy.DockerBuildStrategy

 	SourceBuildStrategy *strategy.SourceBuildStrategy

 	CustomBuildStrategy *strategy.CustomBuildStrategy

@@ -81,8 +83,10 @@ func (factory *BuildControllerFactory) Create() controller.RunnableController {

 	client := ControllerClient{factory.KubeClient, factory.OSClient}

 	buildController := &buildcontroller.BuildController{

 		BuildUpdater:      factory.BuildUpdater,

+		BuildLister:       factory.BuildLister,

 		ImageStreamClient: client,

 		PodManager:        client,

+		RunPolicies:       policy.GetAllRunPolicies(factory.BuildLister, factory.BuildUpdater),

 		BuildStrategy: &typeBasedFactoryStrategy{

 			DockerBuildStrategy: factory.DockerBuildStrategy,

 			SourceBuildStrategy: factory.SourceBuildStrategy,

new file mode 100644

@@ -0,0 +1,35 @@

+package policy

+

+import (

+	"fmt"

+

+	buildapi "github.com/openshift/origin/pkg/build/api"

+)

+

+// NoBuildConfigLabelError represents an error caused by the build not having

+// the required build config label.

+type NoBuildConfigLabelError struct {

+	build *buildapi.Build

+}

+

+func NewNoBuildConfigLabelError(build *buildapi.Build) error {

+	return NoBuildConfigLabelError{build: build}

+}

+

+func (e NoBuildConfigLabelError) Error() string {

+	return fmt.Sprintf("build %s/%s does not have required %q label set", e.build.Namespace, e.build.Name, buildapi.BuildConfigLabel)

+}

+

+// NoBuildNumberLabelError represents an error caused by the build not having

+// the required build number annotation.

+type NoBuildNumberAnnotationError struct {

+	build *buildapi.Build

+}

+

+func NewNoBuildNumberAnnotationError(build *buildapi.Build) error {

+	return NoBuildNumberAnnotationError{build: build}

+}

+

+func (e NoBuildNumberAnnotationError) Error() string {

+	return fmt.Sprintf("build %s/%s does not have required %q annotation set", e.build.Namespace, e.build.Name, buildapi.BuildNumberAnnotation)

+}

new file mode 100644

@@ -0,0 +1,32 @@

+package policy

+

+import (

+	buildapi "github.com/openshift/origin/pkg/build/api"

+	buildclient "github.com/openshift/origin/pkg/build/client"

+	buildutil "github.com/openshift/origin/pkg/build/util"

+)

+

+// ParallelPolicy implements the RunPolicy interface. Build created using this

+// run policy will always run as soon as they are created.

+// This run policy does not guarantee that the builds will complete in same

+// order as they were created and using this policy might cause unpredictable

+// behavior.

+type ParallelPolicy struct {

+	BuildLister  buildclient.BuildLister

+	BuildUpdater buildclient.BuildUpdater

+}

+

+// IsRunnable implements the RunPolicy interface. The parallel builds are run as soon

+// as they are created. There is no build queue as all build run asynchronously.

+func (s *ParallelPolicy) IsRunnable(build *buildapi.Build) (bool, error) {

+	bcName := buildutil.ConfigNameForBuild(build)

+	if len(bcName) == 0 {

+		return false, NewNoBuildConfigLabelError(build)

+	}

+	return !hasRunningSerialBuild(s.BuildLister, build.Namespace, bcName), nil

+}

+

+// OnComplete implements the RunPolicy interface.

+func (s *ParallelPolicy) OnComplete(build *buildapi.Build) error {

+	return handleComplete(s.BuildLister, s.BuildUpdater, build)

+}

new file mode 100644

@@ -0,0 +1,64 @@

+package policy

+

+import (

+	"testing"

+

+	buildapi "github.com/openshift/origin/pkg/build/api"

+)

+

+func TestParallelIsRunnableNewBuilds(t *testing.T) {

+	allNewBuilds := []buildapi.Build{

+		addBuild("build-1", "sample-bc", buildapi.BuildPhaseNew, buildapi.BuildRunPolicyParallel),

+		addBuild("build-2", "sample-bc", buildapi.BuildPhaseNew, buildapi.BuildRunPolicyParallel),

+		addBuild("build-3", "sample-bc", buildapi.BuildPhaseNew, buildapi.BuildRunPolicyParallel),

+	}

+	client := newTestClient(allNewBuilds)

+	policy := ParallelPolicy{BuildLister: client, BuildUpdater: client}

+	for _, build := range allNewBuilds {

+		runnable, err := policy.IsRunnable(&build)

+		if err != nil {

+			t.Errorf("expected no error, got %v", err)

+		}

+		if !runnable {

+			t.Errorf("expected build %s runnable, is not", build.Name)

+		}

+	}

+}

+

+func TestParallelIsRunnableMixedBuilds(t *testing.T) {

+	mixedBuilds := []buildapi.Build{

+		addBuild("build-4", "sample-bc", buildapi.BuildPhaseRunning, buildapi.BuildRunPolicyParallel),

+		addBuild("build-6", "sample-bc", buildapi.BuildPhaseNew, buildapi.BuildRunPolicyParallel),

+		addBuild("build-5", "sample-bc", buildapi.BuildPhasePending, buildapi.BuildRunPolicyParallel),

+	}

+	client := newTestClient(mixedBuilds)

+	policy := ParallelPolicy{BuildLister: client, BuildUpdater: client}

+	for _, build := range mixedBuilds {

+		runnable, err := policy.IsRunnable(&build)

+		if err != nil {

+			t.Errorf("expected no error, got %v", err)

+		}

+		if !runnable {

+			t.Errorf("expected build %s runnable, is not", build.Name)

+		}

+	}

+}

+

+func TestParallelIsRunnableWithSerialRunning(t *testing.T) {

+	mixedBuilds := []buildapi.Build{

+		addBuild("build-7", "sample-bc", buildapi.BuildPhaseRunning, buildapi.BuildRunPolicySerial),

+		addBuild("build-8", "sample-bc", buildapi.BuildPhaseNew, buildapi.BuildRunPolicyParallel),

+		addBuild("build-9", "sample-bc", buildapi.BuildPhaseNew, buildapi.BuildRunPolicyParallel),

+	}

+	client := newTestClient(mixedBuilds)

+	policy := ParallelPolicy{BuildLister: client, BuildUpdater: client}

+	for _, build := range mixedBuilds {

+		runnable, err := policy.IsRunnable(&build)

+		if err != nil {

+			t.Errorf("expected no error, got %v", err)

+		}

+		if runnable {

+			t.Errorf("expected build %s as not runnable", build.Name)

+		}

+	}

+}

new file mode 100644

@@ -0,0 +1,140 @@

+package policy

+

+import (

+	"fmt"

+	"time"

+

+	"github.com/golang/glog"

+	buildapi "github.com/openshift/origin/pkg/build/api"

+	buildclient "github.com/openshift/origin/pkg/build/client"

+	buildutil "github.com/openshift/origin/pkg/build/util"

+	"k8s.io/kubernetes/pkg/api/errors"

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

+	"k8s.io/kubernetes/pkg/util/wait"

+)

+

+// RunPolicy is an interface that define handler for the build runPolicy field.

+// The run policy controls how and when the new builds are 'run'.

+type RunPolicy interface {

+	// IsRunnable returns true of the given build should be executed.

+	IsRunnable(*buildapi.Build) (bool, error)

+

+	// OnComplete allows policy to execute action when the given build just

+	// completed.

+	OnComplete(*buildapi.Build) error

+}

+

+// GetAllRunPolicies returns a set of all run policies.

+func GetAllRunPolicies(lister buildclient.BuildLister, updater buildclient.BuildUpdater) []RunPolicy {

+	return []RunPolicy{

+		&ParallelPolicy{BuildLister: lister, BuildUpdater: updater},

+		&SerialPolicy{BuildLister: lister, BuildUpdater: updater},

+		&SerialLatestOnlyPolicy{BuildLister: lister, BuildUpdater: updater},

+	}

+}

+

+// ForBuild picks the appropriate run policy for the given build.

+func ForBuild(build *buildapi.Build, policies []RunPolicy) RunPolicy {

+	for _, s := range policies {

+		switch buildutil.BuildRunPolicy(build) {

+		case buildapi.BuildRunPolicyParallel:

+			if _, ok := s.(*ParallelPolicy); ok {

+				glog.V(5).Infof("Using %T run policy for build %s/%s", s, build.Namespace, build.Name)

+				return s

+			}

+		case buildapi.BuildRunPolicySerial:

+			if _, ok := s.(*SerialPolicy); ok {

+				glog.V(5).Infof("Using %T run policy for build %s/%s", s, build.Namespace, build.Name)

+				return s

+			}

+		case buildapi.BuildRunPolicySerialLatestOnly:

+			if _, ok := s.(*SerialLatestOnlyPolicy); ok {

+				glog.V(5).Infof("Using %T run policy for build %s/%s", s, build.Namespace, build.Name)

+				return s

+			}

+		}

+	}

+	return nil

+}

+

+// hasRunningSerialBuild indicates that there is a running or pending serial

+// build. This function is used to prevent running parallel builds because

+// serial builds should always run alone.

+func hasRunningSerialBuild(lister buildclient.BuildLister, namespace, buildConfigName string) bool {

+	var hasRunningBuilds bool

+	buildutil.BuildConfigBuilds(lister, namespace, buildConfigName, func(b buildapi.Build) bool {

+		switch b.Status.Phase {

+		case buildapi.BuildPhasePending, buildapi.BuildPhaseRunning:

+			switch buildutil.BuildRunPolicy(&b) {

+			case buildapi.BuildRunPolicySerial, buildapi.BuildRunPolicySerialLatestOnly:

+				hasRunningBuilds = true

+			}

+		}

+		return false

+	})

+	return hasRunningBuilds

+}

+

+// GetNextConfigBuild returns the build that will be executed next for the given

+// build configuration. It also returns the indication whether there are

+// currently running builds, to make sure there is no race-condition between

+// re-listing the builds.

+func GetNextConfigBuild(lister buildclient.BuildLister, namespace, buildConfigName string) (*buildapi.Build, bool, error) {

+	var (

+		nextBuild           *buildapi.Build

+		hasRunningBuilds    bool

+		previousBuildNumber int64

+	)

+	builds, err := buildutil.BuildConfigBuilds(lister, namespace, buildConfigName, func(b buildapi.Build) bool {

+		switch b.Status.Phase {

+		case buildapi.BuildPhasePending, buildapi.BuildPhaseRunning:

+			hasRunningBuilds = true

+			return false

+		}

+		// Only 'new' build can be scheduled to run next

+		return b.Status.Phase == buildapi.BuildPhaseNew

+	})

+	if err != nil {

+		return nil, hasRunningBuilds, err

+	}

+

+	for i, b := range builds.Items {

+		buildNumber, err := buildutil.BuildNumber(&b)

+		if err != nil {

+			return nil, hasRunningBuilds, err

+		}

+		if previousBuildNumber == 0 || buildNumber < previousBuildNumber {

+			nextBuild = &builds.Items[i]

+			previousBuildNumber = buildNumber

+		}

+	}

+	return nextBuild, hasRunningBuilds, nil

+}

+

+// handleComplete represents the default OnComplete handler. This Handler will

+// check which build should be run next and update the StartTimestamp field for

+// that build. That will trigger HandleBuild() to process that build immediately

+// and as a result the build is immediately executed.

+func handleComplete(lister buildclient.BuildLister, updater buildclient.BuildUpdater, build *buildapi.Build) error {

+	bcName := buildutil.ConfigNameForBuild(build)

+	if len(bcName) == 0 {

+		return NewNoBuildConfigLabelError(build)

+	}

+	nextBuild, hasRunningBuilds, err := GetNextConfigBuild(lister, build.Namespace, bcName)

+	if err != nil {

+		return fmt.Errorf("unable to get the next build for %s/%s: %v", build.Namespace, build.Name, err)

+	}

+	if hasRunningBuilds || nextBuild == nil {

+		return nil

+	}

+	now := unversioned.Now()

+	nextBuild.Status.StartTimestamp = &now

+	return wait.Poll(500*time.Millisecond, 5*time.Second, func() (bool, error) {

+		err := updater.Update(nextBuild.Namespace, nextBuild)

+		if err != nil && errors.IsConflict(err) {

+			glog.V(5).Infof("Error updating build %s/%s: %v (will retry)", nextBuild.Namespace, nextBuild.Name, err)

+			return false, nil

+		}

+		return true, err

+	})

+}

new file mode 100644

@@ -0,0 +1,122 @@

+package policy

+

+import (

+	"strings"

+	"testing"

+

+	"errors"

+

+	buildapi "github.com/openshift/origin/pkg/build/api"

+	kapi "k8s.io/kubernetes/pkg/api"

+	kerrors "k8s.io/kubernetes/pkg/api/errors"

+)

+

+type fakeBuildClient struct {

+	builds         *buildapi.BuildList

+	updateErrCount int

+}

+

+func newTestClient(builds []buildapi.Build) *fakeBuildClient {

+	return &fakeBuildClient{builds: &buildapi.BuildList{Items: builds}}

+}

+

+func (f *fakeBuildClient) List(namespace string, opts kapi.ListOptions) (*buildapi.BuildList, error) {

+	return f.builds, nil

+}

+

+func (f *fakeBuildClient) Update(namespace string, build *buildapi.Build) error {

+	// Make sure every update fails at least once with conflict to ensure build updates are

+	// retried.

+	if f.updateErrCount == 0 {

+		f.updateErrCount = 1

+		return kerrors.NewConflict(kapi.Resource("builds"), build.Name, errors.New("confict"))

+	} else {

+		f.updateErrCount = 0

+	}

+	for i, item := range f.builds.Items {

+		if build.Name == item.Name {

+			f.builds.Items[i] = *build

+		}

+	}

+	return nil

+}

+