github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 02:34:03 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2016-12-06 21:14:35 -08:00 committed by GitHub
commit 6a1d0f0b7b
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/deployment.go
View File

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