From 84a743d8364a8f5e33c8f8ad7d81f0086dfa7075 Mon Sep 17 00:00:00 2001
From: deads2k <deads@redhat.com>
Date: Fri, 28 Jul 2017 11:12:16 -0400
Subject: [PATCH] make the router integration tests run as part of
 test-end-to-end

---
 Makefile                                        | 9 +++++++--
 test/{integration => end-to-end}/router_test.go | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)
 rename test/{integration => end-to-end}/router_test.go (99%)

diff --git a/Makefile b/Makefile
index 69c415d4fd95..16ce89fbde84 100644
--- a/Makefile
+++ b/Makefile
@@ -45,17 +45,21 @@ all build:
 #
 # Example:
 #   make build-tests
-build-tests: build-extended-test build-integration-test
+build-tests: build-extended-test build-integration-test build-router-e2e-test
 .PHONY: build-tests
 
 build-extended-test:
 	hack/build-go.sh test/extended/extended.test
 .PHONY: build-extended-test
 
-build-integration-test:
+build-integration-test: build-router-e2e-test
 	hack/build-go.sh test/integration/integration.test
 .PHONY: build-integration-test
 
+build-router-e2e-test:
+	hack/build-go.sh test/end-to-end/end-to-end.test
+.PHONY: build-router-e2e-test
+
 # Run core verification and all self contained tests.
 #
 # Example:
@@ -187,6 +191,7 @@ test-cmd: build
 # Example:
 #   make test-end-to-end
 test-end-to-end: build
+	KUBE_COVER=" " KUBE_RACE=" " OS_TEST_PACKAGE=test/end-to-end hack/test-integration.sh
 	hack/test-end-to-end.sh
 .PHONY: test-end-to-end
 
diff --git a/test/integration/router_test.go b/test/end-to-end/router_test.go
similarity index 99%
rename from test/integration/router_test.go
rename to test/end-to-end/router_test.go
index bfc2de6481cc..a8fbdf903973 100644
--- a/test/integration/router_test.go
+++ b/test/end-to-end/router_test.go
@@ -1,4 +1,4 @@
-package integration
+package endtoend
 
 import (
 	"crypto/tls"