Merge pull request #38664 from dashpole/flaky_inode

Automatic merge from submit-queue Inode Eviction Test is Flaky This Pull Request: Marks the InodeEviciton test as flaky Increases the timeout for disk pressure because coreos has nearly 2 million inodes. Decreases the status polling interval so we can see eviction ordering better. @Random-Liu

Merge pull request #38664 from dashpole/flaky_inode
aca523f5 · Kubernetes Submit Queue · GitHub · 64165483 · 0ec48230 · aca523f5
Commit aca523f5 authored Dec 13, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 13, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

inode_eviction_test.go test/e2e_node/inode_eviction_test.go +3 -3

No files found.
--- a/test/e2e_node/inode_eviction_test.go
+++ b/test/e2e_node/inode_eviction_test.go
@@ -32,13 +32,13 @@ import (
 const (
 	postTestConditionMonitoringPeriod = 2 * time.Minute
-	evictionPollInterval              = 5 * time.Second
+	evictionPollInterval              = 2 * time.Second
 	// pressure conditions often surface after evictions because of delay in propegation of metrics to pressure
 	// we wait this period after evictions to make sure that we wait out this delay
 	pressureDelay = 20 * time.Second
 )
-var _ = framework.KubeDescribe("InodeEviction [Slow] [Serial] [Disruptive]", func() {
+var _ = framework.KubeDescribe("InodeEviction [Slow] [Serial] [Disruptive] [Flaky]", func() {
 	f := framework.NewDefaultFramework("inode-eviction-test")
 	podTestSpecs := []podTestSpec{
@@ -109,7 +109,7 @@ var _ = framework.KubeDescribe("InodeEviction [Slow] [Serial] [Disruptive]", fun
 			},
 		},
 	}
-	evictionTestTimeout := 10 * time.Minute
+	evictionTestTimeout := 60 * time.Minute
 	testCondition := "Disk Pressure due to Inodes"
 	runEvictionTest(f, testCondition, podTestSpecs, evictionTestTimeout, hasInodePressure)