Fix Kubemark tests by not gathering resource usage data

This commit is contained in:
Wojciech Tyczynski 2015-11-09 11:05:52 +01:00
parent 3e5589c1af
commit 5e9fe7abff
5 changed files with 20 additions and 17 deletions

View File

@ -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}

View File

@ -101,6 +101,7 @@ framework-name
framework-weburi
func-dest
fuzz-iters
gather-resource-usage
gce-project
gce-zone
gke-cluster

View File

@ -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

View File

@ -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) {

View File

@ -124,6 +124,7 @@ type TestContextType struct {
PrometheusPushGateway string
VerifyServiceAccount bool
DeleteNamespace bool
GatherKubeSystemResourceUsageData bool
}
var testContext TestContextType