@@ -38,10 +38,11 @@ func FilterBuilds(builds []Build, predicate PredicateFunc) []Build {

 	return result

 }

-// ByBuildConfigLabelPredicate matches all builds that have build config label with specified value.

-func ByBuildConfigLabelPredicate(labelValue string) PredicateFunc {

+// ByBuildConfigPredicate matches all builds that have build config annotation or label with specified value.

+func ByBuildConfigPredicate(labelValue string) PredicateFunc {

 	return func(arg interface{}) bool {

-		return (hasBuildConfigLabel(arg.(Build), BuildConfigLabel, labelValue) ||

+		return (hasBuildConfigAnnotation(arg.(Build), BuildConfigAnnotation, labelValue) ||

+			hasBuildConfigLabel(arg.(Build), BuildConfigLabel, labelValue) ||

 			hasBuildConfigLabel(arg.(Build), BuildConfigLabelDeprecated, labelValue))

 	}

 }

@@ -50,3 +51,11 @@ func hasBuildConfigLabel(build Build, labelName, labelValue string) bool {

 	value, ok := build.Labels[labelName]

 	return ok && value == labelValue

 }

+

+func hasBuildConfigAnnotation(build Build, annotationName, annotationValue string) bool {

+	if build.Annotations == nil {

+		return false

+	}

+	value, ok := build.Annotations[annotationName]

+	return ok && value == annotationValue

+}

@@ -64,7 +64,32 @@ func TestFilterBuilds_withFilteredElements(t *testing.T) {

 	assertThatArraysAreEquals(t, actual, expected)

 }

-func TestByBuildConfigLabelPredicate_withBuildConfigLabel(t *testing.T) {

+func TestByBuildConfigPredicate_withBuildConfigAnnotation(t *testing.T) {

+	input := []Build{

+		{

+			ObjectMeta: kapi.ObjectMeta{

+				Name:        "build1-abc",

+				Annotations: map[string]string{BuildConfigAnnotation: "foo"},

+			},

+		},

+		{

+			ObjectMeta: kapi.ObjectMeta{

+				Name:   "build2-abc",

+				Labels: map[string]string{"bar": "baz"},

+			},

+		},

+	}

+

+	expected := []Build{input[0]}

+

+	actual := FilterBuilds(input, ByBuildConfigPredicate("foo"))

+	assertThatArraysAreEquals(t, actual, expected)

+

+	actual = FilterBuilds(input, ByBuildConfigPredicate("not-foo"))

+	assertThatArrayIsEmpty(t, actual)

+}

+

+func TestByBuildConfigPredicate_withBuildConfigLabel(t *testing.T) {

 	input := []Build{

 		{

 			ObjectMeta: kapi.ObjectMeta{

@@ -82,14 +107,14 @@ func TestByBuildConfigLabelPredicate_withBuildConfigLabel(t *testing.T) {

 	expected := []Build{input[0]}

-	actual := FilterBuilds(input, ByBuildConfigLabelPredicate("foo"))

+	actual := FilterBuilds(input, ByBuildConfigPredicate("foo"))

 	assertThatArraysAreEquals(t, actual, expected)

-	actual = FilterBuilds(input, ByBuildConfigLabelPredicate("not-foo"))

+	actual = FilterBuilds(input, ByBuildConfigPredicate("not-foo"))

 	assertThatArrayIsEmpty(t, actual)

 }

-func TestByBuildConfigLabelPredicate_withBuildConfigLabelDeprecated(t *testing.T) {

+func TestByBuildConfigPredicate_withBuildConfigLabelDeprecated(t *testing.T) {

 	input := []Build{

 		{

 			ObjectMeta: kapi.ObjectMeta{

@@ -107,14 +132,14 @@ func TestByBuildConfigLabelPredicate_withBuildConfigLabelDeprecated(t *testing.T

 	expected := []Build{input[0]}

-	actual := FilterBuilds(input, ByBuildConfigLabelPredicate("foo"))

+	actual := FilterBuilds(input, ByBuildConfigPredicate("foo"))

 	assertThatArraysAreEquals(t, actual, expected)

-	actual = FilterBuilds(input, ByBuildConfigLabelPredicate("not-foo"))

+	actual = FilterBuilds(input, ByBuildConfigPredicate("not-foo"))

 	assertThatArrayIsEmpty(t, actual)

 }

-func TestByBuildConfigLabelPredicate_withBothBuildConfigLabels(t *testing.T) {

+func TestByBuildConfigPredicate_withBothBuildConfigLabels(t *testing.T) {

 	input := []Build{

 		{

 			ObjectMeta: kapi.ObjectMeta{

@@ -138,14 +163,14 @@ func TestByBuildConfigLabelPredicate_withBothBuildConfigLabels(t *testing.T) {

 	expected := []Build{input[0], input[2]}

-	actual := FilterBuilds(input, ByBuildConfigLabelPredicate("foo"))

+	actual := FilterBuilds(input, ByBuildConfigPredicate("foo"))

 	assertThatArraysAreEquals(t, actual, expected)

-	actual = FilterBuilds(input, ByBuildConfigLabelPredicate("not-foo"))

+	actual = FilterBuilds(input, ByBuildConfigPredicate("not-foo"))

 	assertThatArrayIsEmpty(t, actual)

 }

-func TestByBuildConfigLabelPredicate_withoutBuildConfigLabels(t *testing.T) {

+func TestByBuildConfigPredicate_withoutBuildConfigLabels(t *testing.T) {

 	input := []Build{

 		{

 			ObjectMeta: kapi.ObjectMeta{

@@ -155,7 +180,7 @@ func TestByBuildConfigLabelPredicate_withoutBuildConfigLabels(t *testing.T) {

 		},

 	}

-	actual := FilterBuilds(input, ByBuildConfigLabelPredicate("not-foo"))

+	actual := FilterBuilds(input, ByBuildConfigPredicate("not-foo"))

 	assertThatArrayIsEmpty(t, actual)

 }

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

 const (

 	// BuildAnnotation is an annotation that identifies a Pod as being for a Build

 	BuildAnnotation = "openshift.io/build.name"

+	// BuildConfigAnnotation is an annotation that identifies the BuildConfig that a Build was created from

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

 	// BuildNumberAnnotation is an annotation whose value is the sequential number for this Build

 	BuildNumberAnnotation = "openshift.io/build.number"

 	// BuildCloneAnnotation is an annotation whose value is the name of the build this build was cloned from

@@ -18,6 +20,8 @@ const (

 	// BuildPodNameAnnotation is an annotation whose value is the name of the pod running this build

 	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.

+	// NOTE: The value for this label may not contain the entire Build name because it will be

+	// truncated to maximum label length.

 	BuildLabel = "openshift.io/build.name"

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

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

@@ -33,7 +37,8 @@ const (

 	// 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.

+	// on which the Build is based. NOTE: The value for this label may not contain the entire

+	// BuildConfig name because it will be truncated to maximum label length.

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

 	// BuildConfigLabelDeprecated was used as BuildConfigLabel before adding namespaces.

 	// We keep it for backward compatibility.

@@ -1,6 +1,11 @@

 package api

-import "github.com/openshift/origin/pkg/util/namer"

+import (

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

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

+

+	"github.com/openshift/origin/pkg/util/namer"

+)

 const (

 	// BuildPodSuffix is the suffix used to append to a build pod name given a build name

@@ -45,3 +50,19 @@ func SourceType(source BuildSource) string {

 	}

 	return sourceType

 }

+

+// LabelValue returns a string to use as a value for the Build

+// label in a pod. If the length of the string parameter exceeds

+// the maximum label length, the value will be truncated.

+func LabelValue(name string) string {

+	if len(name) <= validation.DNS1123LabelMaxLength {

+		return name

+	}

+	return name[:validation.DNS1123LabelMaxLength]

+}

+

+// GetBuildName returns the name of a Build associated with the

+// given Pod.

+func GetBuildName(pod *kapi.Pod) string {

+	return pod.Annotations[BuildAnnotation]

+}

new file mode 100644

@@ -0,0 +1,13 @@

+package api

+

+import (

+	"testing"

+

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

+)

+

+func TestGetBuildPodName(t *testing.T) {

+	if expected, actual := "mybuild-build", GetBuildPodName(&Build{ObjectMeta: kapi.ObjectMeta{Name: "mybuild"}}); expected != actual {

+		t.Errorf("Expected %s, got %s", expected, actual)

+	}

+}

@@ -54,7 +54,7 @@ func (bc *BuildController) CancelBuild(build *buildapi.Build) error {

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

-	pod, err := bc.PodManager.GetPod(build.Namespace, buildutil.GetBuildPodName(build))

+	pod, err := bc.PodManager.GetPod(build.Namespace, buildapi.GetBuildPodName(build))

 	if err != nil {

 		if !errors.IsNotFound(err) {

 			return fmt.Errorf("Failed to get pod for build %s/%s: %v", build.Namespace, build.Name, err)

@@ -388,7 +388,7 @@ type BuildDeleteController struct {

 // HandleBuildDeletion deletes a build pod if the corresponding build has been deleted

 func (bc *BuildDeleteController) HandleBuildDeletion(build *buildapi.Build) error {

 	glog.V(4).Infof("Handling deletion of build %s", build.Name)

-	podName := buildutil.GetBuildPodName(build)

+	podName := buildapi.GetBuildPodName(build)

 	pod, err := bc.PodManager.GetPod(build.Namespace, podName)

 	if err != nil && !errors.IsNotFound(err) {

 		glog.V(2).Infof("Failed to find pod with name %s for build %s in namespace %s due to error: %v", podName, build.Name, build.Namespace, err)

@@ -398,7 +398,7 @@ func (bc *BuildDeleteController) HandleBuildDeletion(build *buildapi.Build) erro

 		glog.V(2).Infof("Did not find pod with name %s for build %s in namespace %s", podName, build.Name, build.Namespace)

 		return nil

 	}

-	if buildName := pod.Labels[buildapi.BuildLabel]; buildName != build.Name {

+	if buildName := buildapi.GetBuildName(pod); buildName != build.Name {

 		glog.V(2).Infof("Not deleting pod %s/%s because the build label %s does not match the build name %s", pod.Namespace, podName, buildName, build.Name)

 		return nil

 	}

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

 		ObjectMeta: kapi.ObjectMeta{

 			Name:      "data-build",

 			Namespace: "namespace",

+			Annotations: map[string]string{

+				buildapi.BuildConfigAnnotation: "test-bc",

+			},

 			Labels: map[string]string{

 				"name": "dataBuild",

 				// TODO: Switch this test to use Serial policy

@@ -716,7 +719,10 @@ func TestHandleHandleBuildDeletionOK(t *testing.T) {

 	build := mockBuild(buildapi.BuildPhaseComplete, buildapi.BuildOutput{})

 	ctrl := BuildDeleteController{&customPodManager{

 		GetPodFunc: func(namespace, names string) (*kapi.Pod, error) {

-			return &kapi.Pod{ObjectMeta: kapi.ObjectMeta{Labels: map[string]string{buildapi.BuildLabel: build.Name}}}, nil

+			return &kapi.Pod{ObjectMeta: kapi.ObjectMeta{

+				Labels:      map[string]string{buildapi.BuildLabel: buildapi.LabelValue(build.Name)},

+				Annotations: map[string]string{buildapi.BuildAnnotation: build.Name},

+			}}, nil

 		},

 		DeletePodFunc: func(namespace string, pod *kapi.Pod) error {

 			deleteWasCalled = true

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

 	build := mockBuild(buildapi.BuildPhaseComplete, buildapi.BuildOutput{})

 	ctrl := BuildDeleteController{&customPodManager{

 		GetPodFunc: func(namespace, names string) (*kapi.Pod, error) {

-			return &kapi.Pod{ObjectMeta: kapi.ObjectMeta{Labels: map[string]string{buildapi.BuildLabel: build.Name}}}, nil

+			return &kapi.Pod{ObjectMeta: kapi.ObjectMeta{

+				Labels:      map[string]string{buildapi.BuildLabel: buildapi.LabelValue(build.Name)},

+				Annotations: map[string]string{buildapi.BuildAnnotation: build.Name},

+			}}, nil

 		},

 		DeletePodFunc: func(namespace string, pod *kapi.Pod) error {

 			deleteWasCalled = true

@@ -817,7 +826,10 @@ func TestHandleHandleBuildDeletionDeletePodError(t *testing.T) {

 	build := mockBuild(buildapi.BuildPhaseComplete, buildapi.BuildOutput{})

 	ctrl := BuildDeleteController{&customPodManager{

 		GetPodFunc: func(namespace, names string) (*kapi.Pod, error) {

-			return &kapi.Pod{ObjectMeta: kapi.ObjectMeta{Labels: map[string]string{buildapi.BuildLabel: build.Name}}}, nil

+			return &kapi.Pod{ObjectMeta: kapi.ObjectMeta{

+				Labels:      map[string]string{buildapi.BuildLabel: buildapi.LabelValue(build.Name)},

+				Annotations: map[string]string{buildapi.BuildAnnotation: build.Name},

+			}}, nil

 		},

 		DeletePodFunc: func(namespace string, pod *kapi.Pod) error {

 			return errors.New("random")

@@ -489,7 +489,7 @@ func (lw *buildDeleteLW) List(options kapi.ListOptions) (runtime.Object, error)

 	}

 	for _, pod := range podList.Items {

-		buildName := pod.Labels[buildapi.BuildLabel]

+		buildName := buildapi.GetBuildName(&pod)

 		if len(buildName) == 0 {

 			continue

 		}

@@ -578,7 +578,7 @@ func (lw *buildPodDeleteLW) List(options kapi.ListOptions) (runtime.Object, erro

 			glog.V(5).Infof("Ignoring build %s/%s because it is complete", build.Namespace, build.Name)

 			continue

 		}

-		pod, err := lw.KubeClient.Pods(build.Namespace).Get(buildutil.GetBuildPodName(&build))

+		pod, err := lw.KubeClient.Pods(build.Namespace).Get(buildapi.GetBuildPodName(&build))

 		if err != nil {

 			if !kerrors.IsNotFound(err) {

 				glog.V(4).Infof("Error getting pod for build %s/%s: %v", build.Namespace, build.Name, err)

@@ -587,14 +587,14 @@ func (lw *buildPodDeleteLW) List(options kapi.ListOptions) (runtime.Object, erro

 				pod = nil

 			}

 		} else {

-			if buildName := pod.Labels[buildapi.BuildLabel]; buildName != build.Name {

+			if buildName := buildapi.GetBuildName(pod); buildName != build.Name {

 				pod = nil

 			}

 		}

 		if pod == nil {

 			deletedPod := &kapi.Pod{

 				ObjectMeta: kapi.ObjectMeta{

-					Name:      buildutil.GetBuildPodName(&build),

+					Name:      buildapi.GetBuildPodName(&build),

 					Namespace: build.Namespace,

 				},

 			}

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

 	"k8s.io/kubernetes/pkg/runtime"

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

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

 )

 // CustomBuildStrategy creates a build using a custom builder image.

@@ -69,7 +68,7 @@ func (bs *CustomBuildStrategy) CreateBuildPod(build *buildapi.Build) (*kapi.Pod,

 	privileged := true

 	pod := &kapi.Pod{

 		ObjectMeta: kapi.ObjectMeta{

-			Name:      buildutil.GetBuildPodName(build),

+			Name:      buildapi.GetBuildPodName(build),

 			Namespace: build.Namespace,

 			Labels:    getPodLabels(build),

 		},

@@ -10,10 +10,10 @@ import (

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

 	"k8s.io/kubernetes/pkg/apimachinery/registered"

 	"k8s.io/kubernetes/pkg/runtime"

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

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

 	_ "github.com/openshift/origin/pkg/build/api/install"

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

 )

 func TestCustomCreateBuildPod(t *testing.T) {

@@ -36,10 +36,10 @@ func TestCustomCreateBuildPod(t *testing.T) {

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

 	}

-	if expected, actual := buildutil.GetBuildPodName(expected), actual.ObjectMeta.Name; expected != actual {

+	if expected, actual := buildapi.GetBuildPodName(expected), actual.ObjectMeta.Name; expected != actual {

 		t.Errorf("Expected %s, but got %s!", expected, actual)

 	}

-	if !reflect.DeepEqual(map[string]string{buildapi.BuildLabel: expected.Name}, actual.Labels) {

+	if !reflect.DeepEqual(map[string]string{buildapi.BuildLabel: buildapi.LabelValue(expected.Name)}, actual.Labels) {

 		t.Errorf("Pod Labels does not match Build Labels!")

 	}

 	container := actual.Spec.Containers[0]

@@ -150,6 +150,21 @@ func TestCustomCreateBuildPodWithCustomCodec(t *testing.T) {

 	}

 }

+func TestCustomBuildLongName(t *testing.T) {

+	strategy := CustomBuildStrategy{

+		Codec: kapi.Codecs.LegacyCodec(buildapi.SchemeGroupVersion),

+	}

+	build := mockCustomBuild(false, false)

+	build.Name = strings.Repeat("a", validation.DNS1123LabelMaxLength*2)

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

+	if err != nil {

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

+	}

+	if pod.Labels[buildapi.BuildLabel] != build.Name[:validation.DNS1123LabelMaxLength] {

+		t.Errorf("Unexpected build label value: %s", pod.Labels[buildapi.BuildLabel])

+	}

+}

+

 func mockCustomBuild(forcePull, emptySource bool) *buildapi.Build {

 	timeout := int64(60)

 	src := buildapi.BuildSource{}

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

 	"k8s.io/kubernetes/pkg/runtime"

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

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

 	cmdutil "github.com/openshift/origin/pkg/cmd/util"

 )

@@ -45,7 +44,7 @@ func (bs *DockerBuildStrategy) CreateBuildPod(build *buildapi.Build) (*kapi.Pod,

 	pod := &kapi.Pod{

 		ObjectMeta: kapi.ObjectMeta{

-			Name:      buildutil.GetBuildPodName(build),

+			Name:      buildapi.GetBuildPodName(build),

 			Namespace: build.Namespace,

 			Labels:    getPodLabels(build),

 		},

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

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

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

 	"k8s.io/kubernetes/pkg/runtime"

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

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

 	_ "github.com/openshift/origin/pkg/build/api/install"

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

 )

 func TestDockerCreateBuildPod(t *testing.T) {

@@ -26,10 +26,10 @@ func TestDockerCreateBuildPod(t *testing.T) {

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

 	}

-	if expected, actual := buildutil.GetBuildPodName(expected), actual.ObjectMeta.Name; expected != actual {

+	if expected, actual := buildapi.GetBuildPodName(expected), actual.ObjectMeta.Name; expected != actual {

 		t.Errorf("Expected %s, but got %s!", expected, actual)

 	}

-	if !reflect.DeepEqual(map[string]string{buildapi.BuildLabel: expected.Name}, actual.Labels) {

+	if !reflect.DeepEqual(map[string]string{buildapi.BuildLabel: buildapi.LabelValue(expected.Name)}, actual.Labels) {

 		t.Errorf("Pod Labels does not match Build Labels!")

 	}

 	container := actual.Spec.Containers[0]

@@ -97,6 +97,22 @@ func TestDockerCreateBuildPod(t *testing.T) {

 	}

 }

+func TestDockerBuildLongName(t *testing.T) {

+	strategy := DockerBuildStrategy{

+		Image: "docker-test-image",

+		Codec: kapi.Codecs.LegacyCodec(buildapi.SchemeGroupVersion),

+	}

+	build := mockDockerBuild()

+	build.Name = strings.Repeat("a", validation.DNS1123LabelMaxLength*2)

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

+	if err != nil {

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

+	}

+	if pod.Labels[buildapi.BuildLabel] != build.Name[:validation.DNS1123LabelMaxLength] {

+		t.Errorf("Unexpected build label value: %s", pod.Labels[buildapi.BuildLabel])

+	}

+}

+

 func mockDockerBuild() *buildapi.Build {

 	timeout := int64(60)

 	return &buildapi.Build{

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

 	"k8s.io/kubernetes/pkg/serviceaccount"

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

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

 	cmdutil "github.com/openshift/origin/pkg/cmd/util"

 )

@@ -68,7 +67,7 @@ func (bs *SourceBuildStrategy) CreateBuildPod(build *buildapi.Build) (*kapi.Pod,

 	privileged := true

 	pod := &kapi.Pod{

 		ObjectMeta: kapi.ObjectMeta{

-			Name:      buildutil.GetBuildPodName(build),

+			Name:      buildapi.GetBuildPodName(build),

 			Namespace: build.Namespace,

 			Labels:    getPodLabels(build),

 		},

@@ -112,7 +111,7 @@ func (bs *SourceBuildStrategy) canRunAsRoot(build *buildapi.Build) bool {

 	rootUser = 0

 	pod := &kapi.Pod{

 		ObjectMeta: kapi.ObjectMeta{

-			Name:      buildutil.GetBuildPodName(build),

+			Name:      buildapi.GetBuildPodName(build),

 			Namespace: build.Namespace,

 		},

 		Spec: kapi.PodSpec{

@@ -10,10 +10,10 @@ import (

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

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

 	"k8s.io/kubernetes/pkg/runtime"

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

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

 	_ "github.com/openshift/origin/pkg/build/api/install"

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

 )

 type FakeAdmissionControl struct {

@@ -52,10 +52,10 @@ func testSTICreateBuildPod(t *testing.T, rootAllowed bool) {

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

 	}

-	if expected, actual := buildutil.GetBuildPodName(expected), actual.ObjectMeta.Name; expected != actual {

+	if expected, actual := buildapi.GetBuildPodName(expected), actual.ObjectMeta.Name; expected != actual {

 		t.Errorf("Expected %s, but got %s!", expected, actual)

 	}

-	if !reflect.DeepEqual(map[string]string{buildapi.BuildLabel: expected.Name}, actual.Labels) {

+	if !reflect.DeepEqual(map[string]string{buildapi.BuildLabel: buildapi.LabelValue(expected.Name)}, actual.Labels) {

 		t.Errorf("Pod Labels does not match Build Labels!")

 	}

 	container := actual.Spec.Containers[0]

@@ -148,6 +148,23 @@ func testSTICreateBuildPod(t *testing.T, rootAllowed bool) {

 	}

 }

+func TestS2IBuildLongName(t *testing.T) {

+	strategy := &SourceBuildStrategy{

+		Image:            "sti-test-image",

+		Codec:            kapi.Codecs.LegacyCodec(buildapi.SchemeGroupVersion),

+		AdmissionControl: &FakeAdmissionControl{admit: true},

+	}

+	build := mockSTIBuild()

+	build.Name = strings.Repeat("a", validation.DNS1123LabelMaxLength*2)

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

+	if err != nil {

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

+	}

+	if pod.Labels[buildapi.BuildLabel] != build.Name[:validation.DNS1123LabelMaxLength] {

+		t.Errorf("Unexpected build label value: %s", pod.Labels[buildapi.BuildLabel])

+	}

+}

+

 func mockSTIBuild() *buildapi.Build {

 	timeout := int64(60)

 	return &buildapi.Build{

@@ -257,5 +257,5 @@ func getContainerVerbosity(containerEnv []kapi.EnvVar) (verbosity string) {

 // getPodLabels creates labels for the Build Pod

 func getPodLabels(build *buildapi.Build) map[string]string {

-	return map[string]string{buildapi.BuildLabel: build.Name}

+	return map[string]string{buildapi.BuildLabel: buildapi.LabelValue(build.Name)}

 }

@@ -416,6 +416,7 @@ func (g *BuildGenerator) generateBuildFromConfig(ctx kapi.Context, bc *buildapi.

 		build.Annotations = make(map[string]string)

 	}

 	build.Annotations[buildapi.BuildNumberAnnotation] = strconv.Itoa(bc.Status.LastVersion)

+	build.Annotations[buildapi.BuildConfigAnnotation] = bcCopy.Name

 	if build.Labels == nil {

 		build.Labels = make(map[string]string)

 	}

@@ -666,6 +666,9 @@ func TestGenerateBuildFromConfig(t *testing.T) {

 	if build.Labels["testlabel"] != bc.Labels["testlabel"] {

 		t.Errorf("Build does not contain labels from BuildConfig")

 	}

+	if build.Annotations[buildapi.BuildConfigAnnotation] != bc.Name {

+		t.Errorf("Build does not contain annotation from BuildConfig")

+	}

 	if build.Labels[buildapi.BuildConfigLabel] != bc.Name {

 		t.Errorf("Build does not contain labels from BuildConfig")

 	}

@@ -31,6 +31,7 @@ func TestNamespaceEdgeMatching(t *testing.T) {

 		b.Namespace = namespace

 		b.Name = "the-build"

 		b.Labels = map[string]string{api.BuildConfigLabel: "the-bc"}

+		b.Annotations = map[string]string{api.BuildConfigAnnotation: "the-bc"}

 		nodes.EnsureBuildNode(g, b)

 	}

@@ -55,6 +55,9 @@ func belongsToBuildConfig(config *buildapi.BuildConfig, b *buildapi.Build) bool

 	if b.Labels == nil {

 		return false

 	}

+	if b.Annotations != nil && b.Annotations[buildapi.BuildConfigAnnotation] == config.Name {

+		return true

+	}

 	if b.Labels[buildapi.BuildConfigLabel] == config.Name {

 		return true

 	}

@@ -75,6 +75,15 @@ func (reaper *BuildConfigReaper) Stop(namespace, name string, timeout time.Durat

 	}

 	errList := []error{}

 	for _, build := range builds.Items {

+		if build.Annotations != nil {

+			if bcName, ok := build.Annotations[buildapi.BuildConfigAnnotation]; ok {

+				// The annotation, if present, has the full build config name.

+				// Check it before proceeding.

+				if bcName != name {

+					continue

+				}

+			}

+		}

 		noBuildFound = false

 		if err := reaper.oc.Builds(namespace).Delete(build.Name); err != nil {

 			glog.Warningf("Cannot delete Build %s/%s: %v", build.Namespace, build.Name, err)

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

 import (

 	"fmt"

 	"reflect"

+	"strings"

 	"testing"

 	"time"

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

 	ktestclient "k8s.io/kubernetes/pkg/client/unversioned/testclient"

 	"k8s.io/kubernetes/pkg/labels"

 	"k8s.io/kubernetes/pkg/runtime"

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

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

 	_ "github.com/openshift/origin/pkg/build/api/install"

@@ -18,10 +20,14 @@ import (

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

 )

+var (

+	configName = strings.Repeat("a", validation.DNS1123LabelMaxLength)

+)

+

 func makeBuildConfig(version int, deleting bool) *buildapi.BuildConfig {

 	ret := &buildapi.BuildConfig{

 		ObjectMeta: kapi.ObjectMeta{

-			Name:        "config",

+			Name:        configName,

 			Namespace:   "default",

 			Annotations: make(map[string]string),

 		},

@@ -39,9 +45,10 @@ func makeBuildConfig(version int, deleting bool) *buildapi.BuildConfig {

 func makeBuild(version int) buildapi.Build {

 	return buildapi.Build{

 		ObjectMeta: kapi.ObjectMeta{

-			Name:      fmt.Sprintf("build-%d", version),

-			Namespace: "default",

-			Labels:    map[string]string{buildapi.BuildConfigLabel: "config"},

+			Name:        fmt.Sprintf("build-%d", version),

+			Namespace:   "default",

+			Labels:      map[string]string{buildapi.BuildConfigLabel: buildapi.LabelValue(configName)},

+			Annotations: map[string]string{buildapi.BuildConfigAnnotation: configName},

 		},

 	}

 }

@@ -49,9 +56,10 @@ func makeBuild(version int) buildapi.Build {

 func makeDeprecatedBuild(version int) buildapi.Build {

 	return buildapi.Build{

 		ObjectMeta: kapi.ObjectMeta{

-			Name:      fmt.Sprintf("build-%d", version),

-			Namespace: "default",

-			Labels:    map[string]string{buildapi.BuildConfigLabelDeprecated: "config"},

+			Name:        fmt.Sprintf("build-%d", version),

+			Namespace:   "default",

+			Labels:      map[string]string{buildapi.BuildConfigLabelDeprecated: buildapi.LabelValue(configName)},

+			Annotations: map[string]string{buildapi.BuildConfigAnnotation: configName},

 		},

 	}

 }

@@ -61,6 +69,7 @@ func makeBuildList(version int) *buildapi.BuildList {

 		panic("version needs be even")

 	}

 	list := &buildapi.BuildList{}

+

 	for i := 1; i <= version; i += 2 {

 		list.Items = append(list.Items, makeBuild(i))

 		list.Items = append(list.Items, makeDeprecatedBuild(i+1))

@@ -106,7 +115,7 @@ func actionsAreEqual(a, b ktestclient.Action) bool {

 func TestStop(t *testing.T) {

 	notFound := func() runtime.Object {

-		return &(kerrors.NewNotFound(buildapi.Resource("BuildConfig"), "config").(*kerrors.StatusError).ErrStatus)

+		return &(kerrors.NewNotFound(buildapi.Resource("BuildConfig"), configName).(*kerrors.StatusError).ErrStatus)

 	}

 	tests := map[string]struct {

@@ -117,36 +126,36 @@ func TestStop(t *testing.T) {

 		"simple stop": {

 			oc: newBuildListFake(makeBuildConfig(0, false)),

 			expected: []ktestclient.Action{

-				ktestclient.NewGetAction("buildconfigs", "default", "config"),

+				ktestclient.NewGetAction("buildconfigs", "default", configName),

 				ktestclient.NewUpdateAction("buildconfigs", "default", makeBuildConfig(0, true)),

-				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelector("config")}),

-				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelectorDeprecated("config")}),

-				ktestclient.NewDeleteAction("buildconfigs", "default", "config"),

+				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelector(configName)}),

+				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelectorDeprecated(configName)}),

+				ktestclient.NewDeleteAction("buildconfigs", "default", configName),

 			},

 			err: false,

 		},

 		"multiple builds": {

 			oc: newBuildListFake(makeBuildConfig(4, false), makeBuildList(4)),

 			expected: []ktestclient.Action{

-				ktestclient.NewGetAction("buildconfigs", "default", "config"),

+				ktestclient.NewGetAction("buildconfigs", "default", configName),

 				ktestclient.NewUpdateAction("buildconfigs", "default", makeBuildConfig(4, true)),

-				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelector("config")}),

+				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelector(configName)}),

 				ktestclient.NewDeleteAction("builds", "default", "build-1"),

 				ktestclient.NewDeleteAction("builds", "default", "build-3"),

-				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelectorDeprecated("config")}),

+				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelectorDeprecated(configName)}),

 				ktestclient.NewDeleteAction("builds", "default", "build-2"),

 				ktestclient.NewDeleteAction("builds", "default", "build-4"),

-				ktestclient.NewDeleteAction("buildconfigs", "default", "config"),

+				ktestclient.NewDeleteAction("buildconfigs", "default", configName),

 			},

 			err: false,

 		},

 		"no config, some builds": {

 			oc: newBuildListFake(makeBuildList(2)),

 			expected: []ktestclient.Action{

-				ktestclient.NewGetAction("buildconfigs", "default", "config"),

-				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelector("config")}),

+				ktestclient.NewGetAction("buildconfigs", "default", configName),

+				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelector(configName)}),

 				ktestclient.NewDeleteAction("builds", "default", "build-1"),

-				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelectorDeprecated("config")}),

+				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelectorDeprecated(configName)}),

 				ktestclient.NewDeleteAction("builds", "default", "build-2"),

 			},

 			err: false,

@@ -154,20 +163,20 @@ func TestStop(t *testing.T) {

 		"no config, no builds": {

 			oc: testclient.NewSimpleFake(notFound()),

 			expected: []ktestclient.Action{

-				ktestclient.NewGetAction("buildconfigs", "default", "config"),

-				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelector("config")}),

-				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelectorDeprecated("config")}),

+				ktestclient.NewGetAction("buildconfigs", "default", configName),

+				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelector(configName)}),

+				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelectorDeprecated(configName)}),

 			},

 			err: true,

 		},

 		"config, no builds": {

 			oc: testclient.NewSimpleFake(makeBuildConfig(0, false)),

 			expected: []ktestclient.Action{

-				ktestclient.NewGetAction("buildconfigs", "default", "config"),

+				ktestclient.NewGetAction("buildconfigs", "default", configName),

 				ktestclient.NewUpdateAction("buildconfigs", "default", makeBuildConfig(0, true)),

-				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelector("config")}),

-				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelectorDeprecated("config")}),

-				ktestclient.NewDeleteAction("buildconfigs", "default", "config"),

+				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelector(configName)}),

+				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelectorDeprecated(configName)}),

+				ktestclient.NewDeleteAction("buildconfigs", "default", configName),

 			},

 			err: false,

 		},

@@ -175,7 +184,7 @@ func TestStop(t *testing.T) {

 	for testName, test := range tests {

 		reaper := &BuildConfigReaper{oc: test.oc, pollInterval: time.Millisecond, timeout: time.Millisecond}

-		err := reaper.Stop("default", "config", 1*time.Second, nil)

+		err := reaper.Stop("default", configName, 1*time.Second, nil)

 		if !test.err && err != nil {

 			t.Errorf("%s: unexpected error: %v", testName, err)

@@ -190,7 +190,7 @@ func (h *binaryInstantiateHandler) handle(r io.Reader) (runtime.Object, error) {

 	}

 	// The container should be the default build container, so setting it to blank

-	buildPodName := buildutil.GetBuildPodName(build)

+	buildPodName := buildapi.GetBuildPodName(build)

 	opts := &kapi.PodAttachOptions{

 		Stdin: true,

 	}

@@ -116,7 +116,7 @@ func (r *REST) Get(ctx kapi.Context, name string, opts runtime.Object) (runtime.

 		return nil, errors.NewBadRequest(fmt.Sprintf("build %s is in an error state. %s", build.Name, buildutil.NoBuildLogsMessage))

 	}

 	// The container should be the default build container, so setting it to blank

-	buildPodName := buildutil.GetBuildPodName(build)

+	buildPodName := api.GetBuildPodName(build)

 	logOpts := api.BuildToPodLogOptions(buildLogOpts)

 	location, transport, err := pod.LogLocation(r.PodGetter, r.ConnectionInfo, ctx, buildPodName, logOpts)

 	if err != nil {

@@ -18,12 +18,6 @@ const (

 	NoBuildLogsMessage = "No logs are available."

 )

-// GetBuildPodName returns name of the build pod.

-// TODO: remove in favor of the one in the api package

-func GetBuildPodName(build *buildapi.Build) string {

-	return buildapi.GetBuildPodName(build)

-}

-

 // GetBuildName returns name of the build pod.

 func GetBuildName(pod *kapi.Pod) string {

 	if pod == nil {

@@ -110,7 +104,7 @@ func BuildNameForConfigVersion(name string, version int) string {

 // BuildConfigSelector returns a label Selector which can be used to find all

 // builds for a BuildConfig.

 func BuildConfigSelector(name string) labels.Selector {

-	return labels.Set{buildapi.BuildConfigLabel: name}.AsSelector()

+	return labels.Set{buildapi.BuildConfigLabel: buildapi.LabelValue(name)}.AsSelector()

 }

 // BuildConfigSelectorDeprecated returns a label Selector which can be used to find

@@ -149,6 +143,11 @@ func ConfigNameForBuild(build *buildapi.Build) string {

 	if build == nil {

 		return ""

 	}

+	if build.Annotations != nil {

+		if _, exists := build.Annotations[buildapi.BuildConfigAnnotation]; exists {

+			return build.Annotations[buildapi.BuildConfigAnnotation]

+		}

+	}

 	if _, exists := build.Labels[buildapi.BuildConfigLabel]; exists {

 		return build.Labels[buildapi.BuildConfigLabel]

 	}

deleted file mode 100644

@@ -1,14 +0,0 @@

-package util

-

-import (

-	"testing"

-

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

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

-)

-

-func TestGetBuildPodName(t *testing.T) {

-	if expected, actual := "mybuild-build", GetBuildPodName(&buildapi.Build{ObjectMeta: kapi.ObjectMeta{Name: "mybuild"}}); expected != actual {

-		t.Errorf("Expected %s, got %s", expected, actual)

-	}

-}

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

 	authorizationapi "github.com/openshift/origin/pkg/authorization/api"

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

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

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

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

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

@@ -101,7 +100,7 @@ func (d *BuildDescriber) Describe(namespace, name string) (string, error) {

 		events = &kapi.EventList{}

 	}

 	// get also pod events and merge it all into one list for describe

-	if pod, err := d.kubeClient.Pods(namespace).Get(buildutil.GetBuildPodName(build)); err == nil {

+	if pod, err := d.kubeClient.Pods(namespace).Get(buildapi.GetBuildPodName(build)); err == nil {

 		if podEvents, _ := d.kubeClient.Events(namespace).Search(pod); podEvents != nil {

 			events.Items = append(events.Items, podEvents.Items...)

 		}

@@ -128,7 +127,7 @@ func (d *BuildDescriber) Describe(namespace, name string) (string, error) {

 		if build.Status.Config != nil {

 			formatString(out, "Build Config", build.Status.Config.Name)

 		}

-		formatString(out, "Build Pod", buildutil.GetBuildPodName(build))

+		formatString(out, "Build Pod", buildapi.GetBuildPodName(build))

 		describeBuildSpec(build.Spec, out)

@@ -422,7 +421,7 @@ func (d *BuildConfigDescriber) Describe(namespace, name string) (string, error)

 	if err != nil {

 		return "", err

 	}

-	buildList.Items = buildapi.FilterBuilds(buildList.Items, buildapi.ByBuildConfigLabelPredicate(name))

+	buildList.Items = buildapi.FilterBuilds(buildList.Items, buildapi.ByBuildConfigPredicate(name))

 	return tabbedString(func(out *tabwriter.Writer) error {

 		formatMeta(out, buildConfig.ObjectMeta)

@@ -349,7 +349,7 @@ func NewFactory(clientConfig kclientcmd.ClientConfig) *Factory {

 			if err != nil {

 				return nil, err

 			}

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

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

 			if len(builds.Items) == 0 {

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

 			}

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

 	o "github.com/onsi/gomega"

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

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

 	exutil "github.com/openshift/origin/test/extended/util"

 )

@@ -45,7 +44,7 @@ var _ = g.Describe("[builds][Slow] builds should have deadlines", func() {

 			o.Expect(build.Status.Phase).Should(o.BeEquivalentTo(buildapi.BuildPhaseFailed))

 			g.By("verifying the build pod status")

-			pod, err := oc.KubeREST().Pods(oc.Namespace()).Get(buildutil.GetBuildPodName(&build))