Merge pull request #15778 from deads2k/backport-test-01

Automatic merge from submit-queue

make the router integration tests run as part of test-end-to-end

Fixes #15771.  Maybe.

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
 

test/integration/router_test.go → test/end-to-end/router_test.go

@@ -1,4 +1,4 @@
-package integration
+package endtoend
 
 import (
 	"crypto/tls"