@@ -17295,6 +17295,10 @@

        "$ref": "v1.SecretSpec"

       },

       "description": "a list of secrets to include in the build pod in addition to pull, push and source secrets"

+     },

+     "buildAPIVersion": {

+      "type": "string",

+      "description": "requested API version for the Build object serialized and passed to the custom builder"

      }

     }

    },

@@ -1165,6 +1165,7 @@ func deepCopy_api_CustomBuildStrategy(in buildapi.CustomBuildStrategy, out *buil

 	} else {

 		out.Secrets = nil

 	}

+	out.BuildAPIVersion = in.BuildAPIVersion

 	return nil

 }

@@ -1623,6 +1623,7 @@ func autoconvert_api_CustomBuildStrategy_To_v1_CustomBuildStrategy(in *buildapi.

 	} else {

 		out.Secrets = nil

 	}

+	out.BuildAPIVersion = in.BuildAPIVersion

 	return nil

 }

@@ -2418,6 +2419,7 @@ func autoconvert_v1_CustomBuildStrategy_To_api_CustomBuildStrategy(in *apiv1.Cus

 	} else {

 		out.Secrets = nil

 	}

+	out.BuildAPIVersion = in.BuildAPIVersion

 	return nil

 }

@@ -1191,6 +1191,7 @@ func deepCopy_v1_CustomBuildStrategy(in apiv1.CustomBuildStrategy, out *apiv1.Cu

 	} else {

 		out.Secrets = nil

 	}

+	out.BuildAPIVersion = in.BuildAPIVersion

 	return nil

 }

@@ -1632,6 +1632,7 @@ func autoconvert_api_CustomBuildStrategy_To_v1beta3_CustomBuildStrategy(in *buil

 	} else {

 		out.Secrets = nil

 	}

+	out.BuildAPIVersion = in.BuildAPIVersion

 	return nil

 }

@@ -2427,6 +2428,7 @@ func autoconvert_v1beta3_CustomBuildStrategy_To_api_CustomBuildStrategy(in *apiv

 	} else {

 		out.Secrets = nil

 	}

+	out.BuildAPIVersion = in.BuildAPIVersion

 	return nil

 }

@@ -1199,6 +1199,7 @@ func deepCopy_v1beta3_CustomBuildStrategy(in apiv1beta3.CustomBuildStrategy, out

 	} else {

 		out.Secrets = nil

 	}

+	out.BuildAPIVersion = in.BuildAPIVersion

 	return nil

 }

@@ -356,6 +356,9 @@ type CustomBuildStrategy struct {

 	// Secrets is a list of additional secrets that will be included in the custom build pod

 	Secrets []SecretSpec

+

+	// BuildAPIVersion is the requested API version for the Build object serialized and passed to the custom builder

+	BuildAPIVersion string

 }

 // DockerBuildStrategy defines input parameters specific to Docker build.

@@ -339,6 +339,9 @@ type CustomBuildStrategy struct {

 	// Secrets is a list of additional secrets that will be included in the build pod

 	Secrets []SecretSpec `json:"secrets,omitempty" description:"a list of secrets to include in the build pod in addition to pull, push and source secrets"`

+

+	// BuildAPIVersion is the requested API version for the Build object serialized and passed to the custom builder

+	BuildAPIVersion string `json:"buildAPIVersion,omitempty" description:"requested API version for the Build object serialized and passed to the custom builder"`

 }

 // DockerBuildStrategy defines input parameters specific to Docker build.

@@ -329,6 +329,9 @@ type CustomBuildStrategy struct {

 	// Secrets is a list of additional secrets that will be included in the build pod

 	Secrets []SecretSpec `json:"secrets,omitempty" description:"a list of secrets to include in the build pod in addition to pull, push and source secrets"`

+

+	// BuildAPIVersion is the requested API version for the Build object serialized and passed to the custom builder

+	BuildAPIVersion string `json:"buildAPIVersion,omitempty" description:"requested API version for the Build object serialized and passed to the custom builder"`

 }

 // DockerBuildStrategy defines input parameters specific to Docker build.

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

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

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

+	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"

 )

@@ -153,6 +154,9 @@ func (bc *BuildController) nextBuildPhase(build *buildapi.Build) error {

 	podSpec, err := bc.BuildStrategy.CreateBuildPod(buildCopy)

 	if err != nil {

 		build.Status.Reason = buildapi.StatusReasonCannotCreateBuildPodSpec

+		if strategy.IsFatal(err) {

+			return strategy.FatalError(fmt.Sprintf("failed to create a build pod spec for build %s/%s: %v", build.Namespace, build.Name, err))

+		}

 		return fmt.Errorf("failed to create a build pod spec for build %s/%s: %v", build.Namespace, build.Name, err)

 	}

 	glog.V(4).Infof("Pod %s for build %s/%s is about to be created", podSpec.Name, build.Namespace, build.Name)

@@ -32,13 +32,16 @@ const maxRetries = 60

 // limitedLogAndRetry stops retrying after maxTimeout, failing the build.

 func limitedLogAndRetry(buildupdater buildclient.BuildUpdater, maxTimeout time.Duration) controller.RetryFunc {

 	return func(obj interface{}, err error, retries controller.Retry) bool {

+		isFatal := strategy.IsFatal(err)

 		build := obj.(*buildapi.Build)

-		if time.Since(retries.StartTimestamp.Time) < maxTimeout {

+		if !isFatal && time.Since(retries.StartTimestamp.Time) < maxTimeout {

 			glog.V(4).Infof("Retrying Build %s/%s with error: %v", build.Namespace, build.Name, err)

 			return true

 		}

 		build.Status.Phase = buildapi.BuildPhaseFailed

-		build.Status.Reason = buildapi.StatusReasonExceededRetryTimeout

+		if !isFatal {

+			build.Status.Reason = buildapi.StatusReasonExceededRetryTimeout

+		}

 		build.Status.Message = errors.ErrorToSentence(err)

 		now := unversioned.Now()

 		build.Status.CompletionTimestamp = &now

@@ -6,8 +6,10 @@ import (

 	"github.com/golang/glog"

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

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

 	"k8s.io/kubernetes/pkg/runtime"

+	"github.com/openshift/origin/pkg/api/latest"

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

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

 )

@@ -22,12 +24,26 @@ type CustomBuildStrategy struct {

 // CreateBuildPod creates the pod to be used for the Custom build

 func (bs *CustomBuildStrategy) CreateBuildPod(build *buildapi.Build) (*kapi.Pod, error) {

-	data, err := bs.Codec.Encode(build)

+	strategy := build.Spec.Strategy.CustomStrategy

+

+	codec := bs.Codec

+	if len(strategy.BuildAPIVersion) != 0 {

+		gv, err := unversioned.ParseGroupVersion(strategy.BuildAPIVersion)

+		if err != nil {

+			return nil, FatalError(fmt.Sprintf("failed to parse buildAPIVersion specified in custom build strategy (%q): %v", strategy.BuildAPIVersion, err))

+		}

+		interfaces, err := latest.InterfacesFor(gv)

+		if err != nil {

+			return nil, FatalError(fmt.Sprintf("invalid buildAPIVersion specified in custom build strategy (%q): %v", strategy.BuildAPIVersion, err))

+		}

+		codec = interfaces.Codec

+	}

+

+	data, err := codec.Encode(build)

 	if err != nil {

 		return nil, fmt.Errorf("failed to encode the build: %v", err)

 	}

-	strategy := build.Spec.Strategy.CustomStrategy

 	containerEnv := []kapi.EnvVar{{Name: "BUILD", Value: string(data)}}

 	if build.Spec.Source.Git != nil {

@@ -1,7 +1,9 @@

 package strategy

 import (

+	"fmt"

 	"reflect"

+	"strings"

 	"testing"

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

@@ -104,6 +106,36 @@ func TestCustomCreateBuildPodExpectedForcePull(t *testing.T) {

 	}

 }

+func TestCustomCreateBuildPodWithCustomCodec(t *testing.T) {

+	strategy := CustomBuildStrategy{

+		Codec: latest.Codec,

+	}

+

+	for _, version := range latest.Versions {

+		// Create new Build specification and modify Spec API version

+		build := mockCustomBuild(false)

+		build.Spec.Strategy.CustomStrategy.BuildAPIVersion = fmt.Sprintf("%s/%s", version.Group, version.Version)

+

+		pod, err := strategy.CreateBuildPod(build)

+		if err != nil {

+			t.Fatalf("Unexpected error: %v", err)

+		}

+		versionFound := false

+		for _, envVar := range pod.Spec.Containers[0].Env {

+			if envVar.Name == "BUILD" {

+				if strings.Contains(envVar.Value, fmt.Sprintf(`"apiVersion":"%s"`, version)) {

+					versionFound = true

+					break

+				}

+				t.Fatalf("BUILD environment variable doesn't contain correct API version")

+			}

+		}

+		if !versionFound {

+			t.Fatalf("Couldn't find BUILD environment variable in pod spec")

+		}

+	}

+}

+

 func mockCustomBuild(forcePull bool) *buildapi.Build {

 	timeout := int64(60)

 	return &buildapi.Build{

@@ -26,6 +26,20 @@ const (

 var whitelistEnvVarNames = []string{"BUILD_LOGLEVEL"}

+// FatalError is an error which can't be retried.

+type FatalError string

+

+// Error implements the error interface.

+func (e FatalError) Error() string {

+	return string(e)

+}

+

+// IsFatal returns true if the error is fatal

+func IsFatal(err error) bool {

+	_, isFatal := err.(FatalError)

+	return isFatal

+}

+

 // setupDockerSocket configures the pod to support the host's Docker socket

 func setupDockerSocket(podSpec *kapi.Pod) {

 	dockerSocketVolume := kapi.Volume{