github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17838 from wojtek-t/fix_scheduler_latency_in_kubemark

Browse Source 
Reenable scheduler metrics in scalability tests.
This commit is contained in:
Piotr Szczesniak 2015-11-27 10:48:45 +01:00
commit ffdf2892c0
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

@ -2131,7 +2131,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.