use lib-go buildmachinery

Author: stlaz

Dockerfile.rhel7

@@ -1,14 +1,35 @@
-GOFLAGS :=
-IMAGE_REPOSITORY_NAME ?= openshift
+.PHONY: all
 
-build:
-	go build -mod=vendor $(GOFLAGS) .
-.PHONY: build
+# Include the library makefile
+include $(addprefix ./vendor/github.com/openshift/build-machinery-go/make/, \
+    golang.mk \
+    targets/openshift/deps-gomod.mk \
+    targets/openshift/images.mk \
+)
 
-images:
-	imagebuilder -f Dockerfile -t $(IMAGE_REPOSITORY_NAME)/oauth-proxy .
-.PHONY: images
+IMAGE_REGISTRY?=registry.svc.ci.openshift.org
+
+# This will call a macro called "build-image" which will generate image specific targets based on the parameters:
+# $0 - macro name
+# $1 - target name
+# $2 - image ref
+# $3 - Dockerfile path
+# $4 - context directory for image build
+# It will generate target "image-$(1)" for building the image and binding it as a prerequisite to target "images".
+$(call build-image,ocp-oauth-proxy,$(IMAGE_REGISTRY)/ocp/4.6:oauth-proxy,./Dockerfile,.)
 
 clean:
 	$(RM) ./oauth-proxy
 .PHONY: clean
+
+GO_BUILD_PACKAGES := .
+# avoid the test/ directory only containing the e2e tests
+GO_TEST_PACKAGES :=./ ./api/... ./cookie/... ./providers/... ./util/...
+
+test-e2e: GO_TEST_PACKAGES :=./test/e2e/...
+test-e2e: GO_TEST_FLAGS += -v
+test-e2e: GO_TEST_FLAGS += -timeout 3h
+test-e2e: GO_TEST_FLAGS += -count 1
+test-e2e: GO_TEST_FLAGS += -p 1
+test-e2e: test-unit
+.PHONY: test-e2e

Makefile

@@ -0,0 +1,9 @@
+// +build tools
+
+// go mod won't pull in code that isn't depended upon, but we have some code we don't depend on from code that must be included
+// for our build to work.
+package dependencymagnet
+
+import (
+	_ "github.com/openshift/build-machinery-go"
+)

dependencymagnet.go

@@ -9,6 +9,7 @@ require (
 	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869
 	github.com/fsnotify/fsnotify v1.4.9
 	github.com/mreiferson/go-options v1.0.0
+	github.com/openshift/build-machinery-go v0.0.0-20200819073603-48aa266c95f7
 	github.com/openshift/library-go v0.0.0-20200918101923-1e4c94603efe
 	github.com/yhat/wsutil v0.0.0-20170731153501-1d66fa95c997
 	golang.org/x/net v0.0.0-20200904194848-62affa334b73