Merge pull request #38221 from kubernetes/revert-38157-disable-overlapping-deployment

Automatic merge from submit-queue (batch tested with PRs 38173, 38151, 38197, 38221) Revert "Disable "overlapping deployment" test on GKE temporarily. #32947" Reverts kubernetes/kubernetes#38157

Merge pull request #38221 from kubernetes/revert-38157-disable-overlapping-deployment
6a1d0f0b · Kubernetes Submit Queue · GitHub · 544ccd2e · c1fa8cb8 · 6a1d0f0b
Commit 6a1d0f0b authored Dec 06, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 06, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

deployment.go test/e2e/deployment.go +0 -1

No files found.
--- a/test/e2e/deployment.go
+++ b/test/e2e/deployment.go
@@ -97,7 +97,6 @@ var _ = framework.KubeDescribe("Deployment", func() {
 		testScaledRolloutDeployment(f)
 	})
 	It("overlapping deployment should not fight with each other", func() {
-		framework.SkipIfProviderIs("gke") // #32947
 		testOverlappingDeployment(f)
 	})
 	It("lack of progress should be reported in the deployment status", func() {