Merge pull request #17838 from wojtek-t/fix_scheduler_latency_in_kubemark

Reenable scheduler metrics in scalability tests.

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")

test/e2e/util.go

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