github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reenable scheduler metrics in scalability tests.

Browse Source
This commit is contained in:
Wojciech Tyczynski 2015-11-26 15:20:10 +01:00
parent 5f8743ea7b
commit 81a105cb73
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/density.go
View File

@ -112,8 +112,7 @@ var _ = Describe("Density [Skipped]", func() {
// Verify scheduler metrics. // Verify scheduler metrics.
// TODO: Reset metrics at the beginning of the test. // TODO: Reset metrics at the beginning of the test.
// We should do something similar to how we do it for APIserver. // We should do something similar to how we do it for APIserver.
// TODO: Reenable it once it is running with Kubemark. expectNoError(VerifySchedulerLatency())
// expectNoError(VerifySchedulerLatency())
}) })
framework := NewFramework("density") framework := NewFramework("density")

2
test/e2e/util.go
View File

@ -2111,7 +2111,7 @@ func getSigner(provider string) (ssh.Signer, error) {
// support. // support.
keyfile := "" keyfile := ""
switch provider { switch provider {
case "gce", "gke": case "gce", "gke", "kubemark":
keyfile = "google_compute_engine" keyfile = "google_compute_engine"
case "aws": case "aws":
// If there is an env. variable override, use that. // If there is an env. variable override, use that.