Merge pull request #60421 from gmarek/quotas

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>. Use quotas in default performance tests Better to use more features in default tests if possible. LGTM whenever you think we're ready. ```release-note NONE ```

Merge pull request #60421 from gmarek/quotas
b13105d4 · Kubernetes Submit Queue · GitHub · 17d69c29 · c3c10208 · b13105d4
Unverified Commit b13105d4 authored Mar 09, 2018 by Kubernetes Submit Queue Committed by GitHub Mar 09, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

density.go test/e2e/scalability/density.go +1 -1

load.go test/e2e/scalability/load.go +1 -1

No files found.
--- 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 {

--- a/test/e2e/scalability/load.go
+++ b/test/e2e/scalability/load.go
@@ -197,7 +197,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 {