From 81a105cb73bf2a88cc4c100b1be5f08992b79f56 Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Thu, 26 Nov 2015 15:20:10 +0100 Subject: [PATCH] Reenable scheduler metrics in scalability tests. --- test/e2e/density.go | 3 +-- test/e2e/util.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/test/e2e/density.go b/test/e2e/density.go index d5b7def7477..74d2444f107 100644 --- a/test/e2e/density.go +++ b/test/e2e/density.go @@ -112,8 +112,7 @@ var _ = Describe("Density [Skipped]", func() { // Verify scheduler metrics. // TODO: Reset metrics at the beginning of the test. // 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") diff --git a/test/e2e/util.go b/test/e2e/util.go index b947374d07e..8257b54148b 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -2111,7 +2111,7 @@ func getSigner(provider string) (ssh.Signer, error) { // support. keyfile := "" switch provider { - case "gce", "gke": + case "gce", "gke", "kubemark": keyfile = "google_compute_engine" case "aws": // If there is an env. variable override, use that.