@@ -265,6 +265,9 @@ type BuildConfig struct {

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

 	Triggers []BuildTriggerPolicy `json:"triggers,omitempty"`

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

+	LastVersion int `json:"lastVersion,omitempty"`

+

 	// Parameters holds all the input necessary to produce a new build. A build config may only

 	// define either the Output.To or Output.DockerImageReference fields, but not both.

 	Parameters BuildParameters `json:"parameters,omitempty"`

@@ -281,6 +281,9 @@ type BuildConfig struct {

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

 	Triggers []BuildTriggerPolicy `json:"triggers,omitempty"`

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

+	LastVersion int `json:"lastVersion,omitempty"`

+

 	// Parameters holds all the input necessary to produce a new build. A build config may only

 	// define either the Output.To or Output.DockerImageReference fields, but not both.

 	Parameters BuildParameters `json:"parameters,omitempty"`

@@ -2,10 +2,12 @@ package util

 import (

 	"fmt"

+

 	"github.com/golang/glog"

 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"

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

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

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

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

 // GenerateBuildFromConfig creates a new build based on a given BuildConfig. Optionally a SourceRevision for the new

 // build can be specified.  Also optionally a list of image names to be substituted can be supplied.  Values in the BuildConfig

 // that have a substitution provided will be replaced in the resulting Build

+// You NEED to update BuildConfig object after calling this!

 func GenerateBuildFromConfig(bc *buildapi.BuildConfig, ref *buildapi.SourceRevision, imageSubstitutions map[string]string,

 	imageRepoSubstitutions map[kapi.ObjectReference]string) (build *buildapi.Build) {

 	// Need to copy the buildConfig here so that it doesn't share pointers with

@@ -29,6 +32,7 @@ func GenerateBuildFromConfig(bc *buildapi.BuildConfig, ref *buildapi.SourceRevis

 			Revision: ref,

 		},

 		ObjectMeta: kapi.ObjectMeta{

+			Name:   GetNextBuildName(bc),

 			Labels: bcCopy.Labels,

 		},

 	}

@@ -59,6 +63,7 @@ func GenerateBuildFromBuild(build *buildapi.Build) *buildapi.Build {

 	return &buildapi.Build{

 		Parameters: buildCopy.Parameters,

 		ObjectMeta: kapi.ObjectMeta{

+			Name:   getNextBuildNameFromBuild(buildCopy),

 			Labels: buildCopy.ObjectMeta.Labels,

 		},

 	}

@@ -71,6 +76,7 @@ func GenerateBuildFromBuild(build *buildapi.Build) *buildapi.Build {

 // an ImageChangeTrigger).  If there is a match in the image repo list, the resulting build will use

 // the image tag from the corresponding image repo rather than the image field from the buildconfig

 // as the base image for the build.

+// You NEED to update BuildConfig object after calling this!

 func GenerateBuildWithImageTag(config *buildapi.BuildConfig, revision *buildapi.SourceRevision, imageRepoGetter osclient.ImageRepositoryNamespaceGetter) (*buildapi.Build, error) {

 	var build *buildapi.Build

 	var err error

@@ -241,3 +247,14 @@ func SubstituteImageRepoReferences(build *buildapi.Build, imageRepo kapi.ObjectR

 func GetBuildPodName(build *buildapi.Build) string {

 	return fmt.Sprintf("pod-%s", build.Name)

 }

+

+// GetNextBuildName returns name of the next build and increments BuildConfig's LastVersion.

+func GetNextBuildName(bc *buildapi.BuildConfig) string {

+	bc.LastVersion++

+	return fmt.Sprintf("%s-%d", bc.Name, bc.LastVersion)

+}

+

+// getNextBuildNameFromBuild returns name of the next build with random uuid added at the end

+func getNextBuildNameFromBuild(build *buildapi.Build) string {

+	return fmt.Sprintf("%s-%d", build.Name, int32(util.Now().Unix()))

+}

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

 import (

 	"fmt"

 	"reflect"

+	"regexp"

 	"testing"

 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

@@ -597,6 +598,24 @@ func TestGetBuildPodName(t *testing.T) {

 	}

 }

+func TestGetNextBuildName(t *testing.T) {

+	bc := mockBuildConfig(mockSource(), mockSTIStrategyForImage(), mockOutput())

+	if expected, actual := bc.Name+"-1", GetNextBuildName(bc); expected != actual {

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

+	}

+	if expected, actual := 1, bc.LastVersion; expected != actual {

+		t.Errorf("Wrong version, expected %d, got %d", expected, actual)

+	}

+}

+

+func TestGetNextBuildNameFromBuild(t *testing.T) {

+	buildName := getNextBuildNameFromBuild(&buildapi.Build{ObjectMeta: kapi.ObjectMeta{Name: "mybuild-1"}})

+	if matched, err := regexp.MatchString(`^mybuild-1-\d+$`, buildName); !matched || err != nil {

+		t.Errorf("Unexpected build name, got %s", buildName)

+	}

+

+}

+

 func mockSource() buildapi.BuildSource {

 	return buildapi.BuildSource{

 		Type: buildapi.BuildSourceGit,

@@ -27,10 +27,11 @@ type Plugin interface {

 // controller used for processing webhook requests.

 type controller struct {

-	buildCreator      buildclient.BuildCreator

-	buildConfigGetter buildclient.BuildConfigGetter

-	imageRepoGetter   osclient.ImageRepositoryNamespaceGetter

-	plugins           map[string]Plugin

+	buildCreator       buildclient.BuildCreator

+	buildConfigGetter  buildclient.BuildConfigGetter

+	buildConfigUpdater buildclient.BuildConfigUpdater

+	imageRepoGetter    osclient.ImageRepositoryNamespaceGetter

+	plugins            map[string]Plugin

 }

 // urlVars holds parsed URL parts.

@@ -43,12 +44,14 @@ type urlVars struct {

 }

 // NewController creates new webhook controller and feed it with provided plugins.

-func NewController(buildConfigGetter buildclient.BuildConfigGetter, buildCreator buildclient.BuildCreator, imageRepoGetter osclient.ImageRepositoryNamespaceGetter, plugins map[string]Plugin) http.Handler {

+func NewController(buildConfigGetter buildclient.BuildConfigGetter, buildConfigUpdater buildclient.BuildConfigUpdater,

+	buildCreator buildclient.BuildCreator, imageRepoGetter osclient.ImageRepositoryNamespaceGetter, plugins map[string]Plugin) http.Handler {

 	return &controller{

-		buildConfigGetter: buildConfigGetter,

-		buildCreator:      buildCreator,

-		imageRepoGetter:   imageRepoGetter,

-		plugins:           plugins,

+		buildConfigGetter:  buildConfigGetter,

+		buildConfigUpdater: buildConfigUpdater,

+		buildCreator:       buildCreator,

+		imageRepoGetter:    imageRepoGetter,

+		plugins:            plugins,

 	}

 }

@@ -93,6 +96,9 @@ func (c *controller) ServeHTTP(w http.ResponseWriter, req *http.Request) {

 		glog.V(4).Infof("Failed creating new build: %v", err)

 		badRequest(w, err.Error())

 	}

+	if err := c.buildConfigUpdater.Update(buildCfg); err != nil {

+		badRequest(w, err.Error())

+	}

 }

 // parseURL retrieves the namespace from the query parameters and returns a context wrapping the namespace,

@@ -48,6 +48,12 @@ func (*okBuildConfigGetter) Get(namespace, name string) (*api.BuildConfig, error

 	}, nil

 }

+type okBuildConfigUpdater struct{}

+

+func (*okBuildConfigUpdater) Update(buildConfig *api.BuildConfig) error {

+	return nil

+}

+

 type okBuildCreator struct{}

 func (*okBuildCreator) Create(namespace string, build *api.Build) error {

@@ -66,6 +72,12 @@ func (*errorBuildConfigGetter) Get(namespace, name string) (*api.BuildConfig, er

 	return &api.BuildConfig{}, errors.New("BuildConfig error!")

 }

+type errorBuildConfigUpdater struct{}

+

+func (*errorBuildConfigUpdater) Update(buildConfig *api.BuildConfig) error {

+	return errors.New("BuildConfig error!")

+}

+

 type pathPlugin struct {

 	Path string

 }

@@ -82,7 +94,8 @@ func (*errPlugin) Extract(buildCfg *api.BuildConfig, secret, path string, req *h

 }

 func TestParseUrlError(t *testing.T) {

-	server := httptest.NewServer(NewController(&okBuildConfigGetter{}, &okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, nil))

+	server := httptest.NewServer(NewController(&okBuildConfigGetter{}, &okBuildConfigUpdater{},

+		&okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, nil))

 	defer server.Close()

 	resp, err := http.Post(server.URL, "application/json", nil)

@@ -97,9 +110,10 @@ func TestParseUrlError(t *testing.T) {

 }

 func TestParseUrlOK(t *testing.T) {

-	server := httptest.NewServer(NewController(&okBuildConfigGetter{}, &okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]Plugin{

-		"pathplugin": &pathPlugin{},

-	}))

+	server := httptest.NewServer(NewController(&okBuildConfigGetter{}, &okBuildConfigUpdater{},

+		&okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]Plugin{

+			"pathplugin": &pathPlugin{},

+		}))

 	defer server.Close()

 	resp, err := http.Post(server.URL+"/build100/secret101/pathplugin",

@@ -116,9 +130,10 @@ func TestParseUrlOK(t *testing.T) {

 func TestParseUrlLong(t *testing.T) {

 	plugin := &pathPlugin{}

-	server := httptest.NewServer(NewController(&okBuildConfigGetter{}, &okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]Plugin{

-		"pathplugin": plugin,

-	}))

+	server := httptest.NewServer(NewController(&okBuildConfigGetter{}, &okBuildConfigUpdater{},

+		&okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]Plugin{

+			"pathplugin": plugin,

+		}))

 	defer server.Close()

 	resp, err := http.Post(server.URL+"/build100/secret101/pathplugin/some/more/args",

@@ -137,7 +152,8 @@ func TestParseUrlLong(t *testing.T) {

 }

 func TestInvokeWebhookErrorSecret(t *testing.T) {

-	server := httptest.NewServer(NewController(&okBuildConfigGetter{}, &okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, nil))

+	server := httptest.NewServer(NewController(&okBuildConfigGetter{}, &okBuildConfigUpdater{},

+		&okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, nil))

 	defer server.Close()

 	resp, err := http.Post(server.URL+"/build100/wrongsecret/somePlugin",

@@ -153,7 +169,8 @@ func TestInvokeWebhookErrorSecret(t *testing.T) {

 }

 func TestInvokeWebhookMissingPlugin(t *testing.T) {

-	server := httptest.NewServer(NewController(&okBuildConfigGetter{}, &okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, nil))

+	server := httptest.NewServer(NewController(&okBuildConfigGetter{}, &okBuildConfigUpdater{},

+		&okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, nil))

 	defer server.Close()

 	resp, err := http.Post(server.URL+"/build100/secret101/missingplugin",

@@ -170,9 +187,10 @@ func TestInvokeWebhookMissingPlugin(t *testing.T) {

 }

 func TestInvokeWebhookErrorBuildConfig(t *testing.T) {

-	server := httptest.NewServer(NewController(&okBuildConfigGetter{}, &errorBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]Plugin{

-		"okPlugin": &pathPlugin{},

-	}))

+	server := httptest.NewServer(NewController(&okBuildConfigGetter{}, &okBuildConfigUpdater{},

+		&errorBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]Plugin{

+			"okPlugin": &pathPlugin{},

+		}))

 	defer server.Close()

 	resp, err := http.Post(server.URL+"/build100/secret101/okPlugin",

@@ -189,7 +207,8 @@ func TestInvokeWebhookErrorBuildConfig(t *testing.T) {

 }

 func TestInvokeWebhookErrorGetConfig(t *testing.T) {

-	server := httptest.NewServer(NewController(&errorBuildConfigGetter{}, &okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, nil))

+	server := httptest.NewServer(NewController(&errorBuildConfigGetter{}, &okBuildConfigUpdater{},

+		&okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, nil))

 	defer server.Close()

 	resp, err := http.Post(server.URL+"/build100/secret101/errPlugin",

@@ -206,9 +225,10 @@ func TestInvokeWebhookErrorGetConfig(t *testing.T) {

 }

 func TestInvokeWebhookErrorCreateBuild(t *testing.T) {

-	server := httptest.NewServer(NewController(&okBuildConfigGetter{}, &okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]Plugin{

-		"errPlugin": &errPlugin{},

-	}))

+	server := httptest.NewServer(NewController(&okBuildConfigGetter{}, &okBuildConfigUpdater{},

+		&okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]Plugin{

+			"errPlugin": &errPlugin{},

+		}))

 	defer server.Close()

 	resp, err := http.Post(server.URL+"/build100/secret101/errPlugin",

@@ -224,6 +244,26 @@ func TestInvokeWebhookErrorCreateBuild(t *testing.T) {

 	}

 }

+func TestInvokeWebhookErrorUpdateBuildConfig(t *testing.T) {

+	server := httptest.NewServer(NewController(&okBuildConfigGetter{}, &errorBuildConfigUpdater{},

+		&okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]Plugin{

+			"okPlugin": &pathPlugin{},

+		}))

+	defer server.Close()

+

+	resp, err := http.Post(server.URL+"/build100/secret101/okPlugin",

+		"application/json", nil)

+	if err != nil {

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

+	}

+	body, _ := ioutil.ReadAll(resp.Body)

+	if resp.StatusCode != http.StatusBadRequest &&

+		!strings.Contains(string(body), "BuildConfig error!") {

+		t.Errorf("Wrong response code, expecting 400, got %s: %s!", resp.Status,

+			string(body))

+	}

+}

+

 type mockOkBuildCreator struct {

 	testBuildInterface

 }

@@ -246,7 +286,7 @@ func (i *testBuildConfigInterface) Get(namespace, name string) (*api.BuildConfig

 	return i.GetBuildConfigFunc(namespace, name)

 }

-func TestInvokeWebhookOk(t *testing.T) {

+func TestInvokeWebhookOK(t *testing.T) {

 	var buildRequest *api.Build

 	buildConfig := &api.BuildConfig{

 		Parameters: api.BuildParameters{

@@ -268,6 +308,7 @@ func TestInvokeWebhookOk(t *testing.T) {

 				},

 			},

 		},

+		&okBuildConfigUpdater{},

 		&mockOkBuildCreator{

 			testBuildInterface: testBuildInterface{

 				CreateFunc: func(namespace string, build *api.Build) error {

@@ -57,6 +57,12 @@ var mockBuildStrategy api.BuildStrategy = api.BuildStrategy{

 	},

 }

+type okBuildConfigUpdater struct{}

+

+func (*okBuildConfigUpdater) Update(buildConfig *api.BuildConfig) error {

+	return nil

+}

+

 type okBuildCreator struct{}

 func (c *okBuildCreator) Create(namespace string, build *api.Build) error {

@@ -64,7 +70,8 @@ func (c *okBuildCreator) Create(namespace string, build *api.Build) error {

 }

 func TestWrongMethod(t *testing.T) {

-	server := httptest.NewServer(webhook.NewController(&okBuildConfigGetter{}, &okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]webhook.Plugin{"github": New()}))

+	server := httptest.NewServer(webhook.NewController(&okBuildConfigGetter{}, &okBuildConfigUpdater{},

+		&okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]webhook.Plugin{"github": New()}))

 	defer server.Close()

 	resp, _ := http.Get(server.URL + "/build100/secret101/github")

@@ -76,7 +83,8 @@ func TestWrongMethod(t *testing.T) {

 }

 func TestWrongContentType(t *testing.T) {

-	server := httptest.NewServer(webhook.NewController(&okBuildConfigGetter{}, &okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]webhook.Plugin{"github": New()}))

+	server := httptest.NewServer(webhook.NewController(&okBuildConfigGetter{}, &okBuildConfigUpdater{},

+		&okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]webhook.Plugin{"github": New()}))

 	defer server.Close()

 	client := &http.Client{}

@@ -93,7 +101,8 @@ func TestWrongContentType(t *testing.T) {

 }

 func TestWrongUserAgent(t *testing.T) {

-	server := httptest.NewServer(webhook.NewController(&okBuildConfigGetter{}, &okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]webhook.Plugin{"github": New()}))

+	server := httptest.NewServer(webhook.NewController(&okBuildConfigGetter{}, &okBuildConfigUpdater{},

+		&okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]webhook.Plugin{"github": New()}))

 	defer server.Close()

 	client := &http.Client{}

@@ -110,7 +119,8 @@ func TestWrongUserAgent(t *testing.T) {

 }

 func TestMissingGithubEvent(t *testing.T) {

-	server := httptest.NewServer(webhook.NewController(&okBuildConfigGetter{}, &okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]webhook.Plugin{"github": New()}))

+	server := httptest.NewServer(webhook.NewController(&okBuildConfigGetter{}, &okBuildConfigUpdater{},

+		&okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]webhook.Plugin{"github": New()}))

 	defer server.Close()

 	client := &http.Client{}

@@ -126,7 +136,8 @@ func TestMissingGithubEvent(t *testing.T) {

 }

 func TestWrongGithubEvent(t *testing.T) {

-	server := httptest.NewServer(webhook.NewController(&okBuildConfigGetter{}, &okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]webhook.Plugin{"github": New()}))

+	server := httptest.NewServer(webhook.NewController(&okBuildConfigGetter{}, &okBuildConfigUpdater{},

+		&okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]webhook.Plugin{"github": New()}))

 	defer server.Close()

 	client := &http.Client{}

@@ -143,7 +154,8 @@ func TestWrongGithubEvent(t *testing.T) {

 }

 func TestJsonPingEvent(t *testing.T) {

-	server := httptest.NewServer(webhook.NewController(&okBuildConfigGetter{}, &okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]webhook.Plugin{"github": New()}))

+	server := httptest.NewServer(webhook.NewController(&okBuildConfigGetter{}, &okBuildConfigUpdater{},

+		&okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]webhook.Plugin{"github": New()}))

 	defer server.Close()

 	postFile("ping", "pingevent.json", server.URL+"/build100/secret101/github",

@@ -151,14 +163,16 @@ func TestJsonPingEvent(t *testing.T) {

 }

 func TestJsonPushEventError(t *testing.T) {

-	server := httptest.NewServer(webhook.NewController(&okBuildConfigGetter{}, &okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]webhook.Plugin{"github": New()}))

+	server := httptest.NewServer(webhook.NewController(&okBuildConfigGetter{}, &okBuildConfigUpdater{},

+		&okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]webhook.Plugin{"github": New()}))

 	defer server.Close()

 	post("push", []byte{}, server.URL+"/build100/secret101/github", http.StatusBadRequest, t)

 }

 func TestJsonPushEvent(t *testing.T) {

-	server := httptest.NewServer(webhook.NewController(&okBuildConfigGetter{}, &okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]webhook.Plugin{"github": New()}))

+	server := httptest.NewServer(webhook.NewController(&okBuildConfigGetter{}, &okBuildConfigUpdater{},

+		&okBuildCreator{}, &okImageRepositoryNamespaceGetter{}, map[string]webhook.Plugin{"github": New()}))

 	defer server.Close()

 	postFile("push", "pushevent.json", server.URL+"/build100/secret101/github",

@@ -52,9 +52,10 @@ func NewCmdStartBuild(fullName string, f *clientcmd.Factory, out io.Writer) *cob

 			checkErr(err)

 			var newBuild *buildapi.Build

+			var config *buildapi.BuildConfig

 			if len(buildName) == 0 {

 				// from build config

-				config, err := client.BuildConfigs(namespace).Get(args[0])

+				config, err = client.BuildConfigs(namespace).Get(args[0])

 				checkErr(err)

 				newBuild, err = buildutil.GenerateBuildWithImageTag(config, nil, client.ImageRepositories(kapi.NamespaceAll).(osclient.ImageRepositoryNamespaceGetter))

@@ -70,6 +71,11 @@ func NewCmdStartBuild(fullName string, f *clientcmd.Factory, out io.Writer) *cob

 			newBuild, err = client.Builds(namespace).Create(newBuild)

 			checkErr(err)

+			if config != nil {

+				_, err := client.BuildConfigs(namespace).Update(config)

+				checkErr(err)

+			}

+

 			if follow {

 				set := labels.Set(newBuild.Labels)

 				selector := labels.SelectorFromSet(set)

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

 import (

 	"fmt"

 	"reflect"

+	"strconv"

 	"strings"

 	"text/tabwriter"

@@ -234,6 +235,11 @@ func (d *BuildConfigDescriber) Describe(namespace, name string) (string, error)

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

 		formatMeta(out, buildConfig.ObjectMeta)

+		if buildConfig.LastVersion == 0 {

+			formatString(out, "Latest Version", "Never built")

+		} else {

+			formatString(out, "Latest Version", strconv.Itoa(buildConfig.LastVersion))

+		}

 		describeBuildParameters(buildConfig.Parameters, out)

 		d.DescribeTriggers(buildConfig, d.host, out)

 		return nil

@@ -247,8 +247,10 @@ func (c *MasterConfig) InstallProtectedAPI(container *restful.Container) []strin

 func (c *MasterConfig) InstallUnprotectedAPI(container *restful.Container) []string {

 	bcClient, _ := c.BuildControllerClients()

+	bcGetterUpdater := buildclient.NewOSClientBuildConfigClient(bcClient)

 	handler := webhook.NewController(

-		buildclient.NewOSClientBuildConfigClient(bcClient),

+		bcGetterUpdater,

+		bcGetterUpdater,

 		buildclient.NewOSClientBuildClient(bcClient),

 		bcClient.ImageRepositories(kapi.NamespaceAll).(osclient.ImageRepositoryNamespaceGetter),

 		map[string]webhook.Plugin{

@@ -223,10 +223,12 @@ func NewTestBuildOpenshift(t *testing.T) *testBuildOpenshift {

 	}

 	openshift.whPrefix = "/osapi/v1beta1/buildConfigHooks/"

+	bcClient := buildclient.NewOSClientBuildConfigClient(osClient)

 	osMux.Handle(openshift.whPrefix, http.StripPrefix(openshift.whPrefix,

-		webhook.NewController(buildclient.NewOSClientBuildConfigClient(osClient), buildclient.NewOSClientBuildClient(osClient), osClient.ImageRepositories(kapi.NamespaceAll).(osclient.ImageRepositoryNamespaceGetter), map[string]webhook.Plugin{

-			"github": github.New(),

-		})))

+		webhook.NewController(bcClient, bcClient, buildclient.NewOSClientBuildClient(osClient),

+			osClient.ImageRepositories(kapi.NamespaceAll).(osclient.ImageRepositoryNamespaceGetter), map[string]webhook.Plugin{

+				"github": github.New(),

+			})))

 	bcFactory := buildcontrollerfactory.BuildControllerFactory{

 		OSClient:     osClient,