Merge pull request #24291 from gmarek/gatherer

Automatic merge from submit-queue Make resource gatherer work for Kubemark
2016-04-23 02:53:58 -07:00
parent 733832c15a 0071a8627c
commit e61e396de7
2 changed files with 86 additions and 37 deletions
--- a/test/e2e/framework/framework.go
+++ b/test/e2e/framework/framework.go
@@ -144,7 +144,7 @@ func (f *Framework) BeforeEach() {
 	}

 	if TestContext.GatherKubeSystemResourceUsageData {
-		f.gatherer, err = NewResourceUsageGatherer(c)
+		f.gatherer, err = NewResourceUsageGatherer(c, ResourceGathererOptions{inKubemark: ProviderIs("kubemark")})
 		if err != nil {
 			Logf("Error while creating NewResourceUsageGatherer: %v", err)
 		} else {