Merge pull request #15766 from danwinship/fix-nodeport-test

Automatic merge from submit-queue (batch tested with PRs 16226, 16377, 15766, 16299, 16153) Fix NodePort test Pulls in the k8s test utils fix from kubernetes/kubernetes#49025 to make the NodePort test work on non-cloud installs again. Fixes #15253
openshift · Sep 18, 2017 · e7ae92c · e7ae92c
2 parents 8452500 + c96875b
commit e7ae92c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/test/extended/networking.sh b/test/extended/networking.sh
@@ -16,7 +16,7 @@ export SHELLOPTS
 #
 # The EmptyDir test is a canary; it will fail if mount propagation is
 # not properly configured on the host.
-NETWORKING_E2E_FOCUS="${NETWORKING_E2E_FOCUS:-etworking|Feature:OSNetworkPolicy|EmptyDir volumes should support \(root,0644,tmpfs\)}"
+NETWORKING_E2E_FOCUS="${NETWORKING_E2E_FOCUS:-etworking|Services should be able to create a functioning NodePort service|Feature:OSNetworkPolicy|EmptyDir volumes should support \(root,0644,tmpfs\)}"
 NETWORKING_E2E_SKIP="${NETWORKING_E2E_SKIP:-}"
 
 DEFAULT_SKIP_LIST=(

diff --git a/test/extended/util/test.go b/test/extended/util/test.go
@@ -298,9 +298,6 @@ var (
 		`validates resource limits of pods that are allowed to run`, // SchedulerPredicates
 		`should idle the service and DeploymentConfig properly`,     // idling with a single service and DeploymentConfig [Conformance]
 
-		// fails without a cloud provider
-		"should be able to create a functioning NodePort service",
-
 		// TODO undisable:
 		"should be schedule to node that don't match the PodAntiAffinity terms",
 		"should perfer to scheduled to nodes pod can tolerate",

diff --git a/vendor/k8s.io/kubernetes/test/e2e/framework/service_util.go b/vendor/k8s.io/kubernetes/test/e2e/framework/service_util.go
diff --git a/vendor/k8s.io/kubernetes/test/e2e/service.go b/vendor/k8s.io/kubernetes/test/e2e/service.go