Merge pull request #33011 from kargakis/fix-flaky-test

Automatic merge from submit-queue test: use low terminationGracePeriod for deployment test Hopefully fixes https://github.com/kubernetes/kubernetes/issues/32692 @janetkuo PTAL

Merge pull request #33011 from kargakis/fix-flaky-test
a44aeca4 · Kubernetes Submit Queue · GitHub · 9a6ed3d0 · 4b45bc1f · a44aeca4
Commit a44aeca4 authored Sep 21, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 21, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

deployment.go test/e2e/deployment.go +2 -2

No files found.
--- a/test/e2e/deployment.go
+++ b/test/e2e/deployment.go
@@ -605,7 +605,7 @@ func testPausedDeployment(f *framework.Framework) {
 	podLabels := map[string]string{"name": nginxImageName}
 	d := newDeployment(deploymentName, 1, podLabels, nginxImageName, nginxImage, extensions.RollingUpdateDeploymentStrategyType, nil)
 	d.Spec.Paused = true
-	tgps := int64(20)
+	tgps := int64(1)
 	d.Spec.Template.Spec.TerminationGracePeriodSeconds = &tgps
 	framework.Logf("Creating paused deployment %s", deploymentName)
 	_, err := c.Extensions().Deployments(ns).Create(d)
@@ -662,7 +662,7 @@ func testPausedDeployment(f *framework.Framework) {

 	// Update the deployment template - the new replicaset should stay the same
 	framework.Logf("Updating paused deployment %q", deploymentName)
-	newTGPS := int64(40)
+	newTGPS := int64(0)
 	deployment, err = framework.UpdateDeploymentWithRetries(c, ns, d.Name, func(update *extensions.Deployment) {
 		update.Spec.Template.Spec.TerminationGracePeriodSeconds = &newTGPS
 	})