Merge pull request #60989 from shyamjvs/disable-quotas-in-scalability…

…-e2es Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Revert "Use quotas in default performance tests" This reverts commit c3c1020. Ref #60988 /cc @gmarek /kind bug /sig scalability /priority critical-urgent ```release-note NONE ```
kubernetes · Mar 9, 2018 · 40143fd · 40143fd
2 parents 7c9293e + 34e7a7c
commit 40143fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/test/e2e/scalability/density.go b/test/e2e/scalability/density.go
@@ -487,7 +487,7 @@ var _ = SIGDescribe("Density", func() {
 	}
 
 	isCanonical := func(test *Density) bool {
-		return test.kind == api.Kind("ReplicationController") && test.daemonsPerNode == 0 && test.secretsPerPod == 0 && test.configMapsPerPod == 0 && test.quotas
+		return test.kind == api.Kind("ReplicationController") && test.daemonsPerNode == 0 && test.secretsPerPod == 0 && test.configMapsPerPod == 0 && !test.quotas
 	}
 
 	for _, testArg := range densityTests {

diff --git a/test/e2e/scalability/load.go b/test/e2e/scalability/load.go
@@ -196,7 +196,7 @@ var _ = SIGDescribe("Load capacity", func() {
 	}
 
 	isCanonical := func(test *Load) bool {
-		return test.podsPerNode == 30 && test.kind == api.Kind("ReplicationController") && test.daemonsPerNode == 0 && test.secretsPerPod == 0 && test.configMapsPerPod == 0 && test.quotas
+		return test.podsPerNode == 30 && test.kind == api.Kind("ReplicationController") && test.daemonsPerNode == 0 && test.secretsPerPod == 0 && test.configMapsPerPod == 0 && !test.quotas
 	}
 
 	for _, testArg := range loadTests {