From 5e9fe7abff11edbdeef51810f3ef3cbe4bd55fa8 Mon Sep 17 00:00:00 2001
From: Wojciech Tyczynski <wojtekt@google.com>
Date: Mon, 9 Nov 2015 11:05:52 +0100
Subject: [PATCH] Fix Kubemark tests by not gathering resource usage data

---
 hack/jenkins/e2e.sh               |  2 +-
 hack/verify-flags/known-flags.txt |  1 +
 test/e2e/density.go               |  2 +-
 test/e2e/e2e_test.go              |  1 +
 test/e2e/util.go                  | 31 ++++++++++++++++---------------
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
index 077906ff5f0..2f5a5132007 100755
--- a/hack/jenkins/e2e.sh
+++ b/hack/jenkins/e2e.sh
@@ -1510,7 +1510,7 @@ if [[ "${USE_KUBEMARK:-}" == "true" ]]; then
   NUM_MINIONS=${KUBEMARK_NUM_MINIONS:-$NUM_MINIONS}
   MASTER_SIZE=${KUBEMARK_MASTER_SIZE:-$MASTER_SIZE}
   ./test/kubemark/start-kubemark.sh
-  ./test/kubemark/run-e2e-tests.sh --ginkgo.focus="should\sallow\sstarting\s30\spods\sper\snode" --delete-namespace="false"
+  ./test/kubemark/run-e2e-tests.sh --ginkgo.focus="should\sallow\sstarting\s30\spods\sper\snode" --delete-namespace="false" --gather-resource-usage="false"
   ./test/kubemark/stop-kubemark.sh
   NUM_MINIONS=${NUM_MINIONS_BKP}
   MASTER_SIZE=${MASTER_SIZE_BKP}
diff --git a/hack/verify-flags/known-flags.txt b/hack/verify-flags/known-flags.txt
index b43e16f5a27..8e9587303a0 100644
--- a/hack/verify-flags/known-flags.txt
+++ b/hack/verify-flags/known-flags.txt
@@ -101,6 +101,7 @@ framework-name
 framework-weburi
 func-dest
 fuzz-iters
+gather-resource-usage
 gce-project
 gce-zone
 gke-cluster
diff --git a/test/e2e/density.go b/test/e2e/density.go
index fa62b3cb0d9..428df01a775 100644
--- a/test/e2e/density.go
+++ b/test/e2e/density.go
@@ -112,7 +112,7 @@ var _ = Describe("Density", func() {
 
 	framework := NewFramework("density")
 	framework.NamespaceDeletionTimeout = time.Hour
-	framework.GatherKubeSystemResourceUsageData = true
+	framework.GatherKubeSystemResourceUsageData = testContext.GatherKubeSystemResourceUsageData
 
 	BeforeEach(func() {
 		c = framework.Client
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
index 40acec4bf8b..c07697f568d 100644
--- a/test/e2e/e2e_test.go
+++ b/test/e2e/e2e_test.go
@@ -83,6 +83,7 @@ func init() {
 	flag.StringVar(&testContext.PrometheusPushGateway, "prom-push-gateway", "", "The URL to prometheus gateway, so that metrics can be pushed during e2es and scraped by prometheus. Typically something like 127.0.0.1:9091.")
 	flag.BoolVar(&testContext.VerifyServiceAccount, "e2e-verify-service-account", true, "If true tests will verify the service account before running.")
 	flag.BoolVar(&testContext.DeleteNamespace, "delete-namespace", true, "If true tests will delete namespace after completion. It is only designed to make debugging easier, DO NOT turn it off by default.")
+	flag.BoolVar(&testContext.GatherKubeSystemResourceUsageData, "gather-resource-usage", true, "If set to true framework will be monitoring resource usage of system add-ons in (some) e2e tests.")
 }
 
 func TestE2E(t *testing.T) {
diff --git a/test/e2e/util.go b/test/e2e/util.go
index 785539a508b..6146c540362 100644
--- a/test/e2e/util.go
+++ b/test/e2e/util.go
@@ -109,21 +109,22 @@ type CloudConfig struct {
 }
 
 type TestContextType struct {
-	KubeConfig            string
-	KubeContext           string
-	CertDir               string
-	Host                  string
-	RepoRoot              string
-	Provider              string
-	CloudConfig           CloudConfig
-	KubectlPath           string
-	OutputDir             string
-	prefix                string
-	MinStartupPods        int
-	UpgradeTarget         string
-	PrometheusPushGateway string
-	VerifyServiceAccount  bool
-	DeleteNamespace       bool
+	KubeConfig                        string
+	KubeContext                       string
+	CertDir                           string
+	Host                              string
+	RepoRoot                          string
+	Provider                          string
+	CloudConfig                       CloudConfig
+	KubectlPath                       string
+	OutputDir                         string
+	prefix                            string
+	MinStartupPods                    int
+	UpgradeTarget                     string
+	PrometheusPushGateway             string
+	VerifyServiceAccount              bool
+	DeleteNamespace                   bool
+	GatherKubeSystemResourceUsageData bool
 }
 
 var testContext TestContextType