Merge pull request #22954 from spxtr/scalability

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2016-03-15 00:55:00 -07:00
commit 90701f8da1
1 changed files with 27 additions and 3 deletions

View File

@ -255,6 +255,33 @@
export GINKGO_TEST_ARGS="--ginkgo.focus=\[Serial\]|\[Disruptive\] \ export GINKGO_TEST_ARGS="--ginkgo.focus=\[Serial\]|\[Disruptive\] \
--ginkgo.skip=\[Flaky\]|\[Feature:.+\]" --ginkgo.skip=\[Flaky\]|\[Feature:.+\]"
export PROJECT="k8s-jkns-e2e-gce-serial-1-2" export PROJECT="k8s-jkns-e2e-gce-serial-1-2"
- 'gce-scalability-release-1.2':
timeout: 120
description: 'Run scalability E2E tests on GCE from the release-1.2 branch.'
job-env: |
export E2E_NAME="e2e-scalability-1-2"
export GINKGO_TEST_ARGS="--ginkgo.focus=\[Feature:Performance\] \
--gather-resource-usage=true \
--gather-metrics-at-teardown=true \
--gather-logs-sizes=true \
--output-print-type=json"
# Use the 1.1 project for now, since it has quota.
export PROJECT="k8s-e2e-gce-scalability-1-1"
export FAIL_ON_GCP_RESOURCE_LEAK="false"
# Override GCE defaults.
export MASTER_SIZE="n1-standard-4"
export NODE_SIZE="n1-standard-2"
export NODE_DISK_SIZE="50GB"
export NUM_NODES="100"
export REGISTER_MASTER="true"
# Reduce logs verbosity
export TEST_CLUSTER_LOG_LEVEL="--v=2"
# TODO: Remove when we figure out the reason for occasional failures #19048
export KUBELET_TEST_LOG_LEVEL="--v=4"
# Increase resync period to simulate production
export TEST_CLUSTER_RESYNC_PERIOD="--min-resync-period=12h"
# Increase delete collection parallelism
export TEST_CLUSTER_DELETE_COLLECTION_WORKERS="--delete-collection-workers=16"
jobs: jobs:
- 'kubernetes-e2e-{suffix}' - 'kubernetes-e2e-{suffix}'
@ -404,9 +431,6 @@
- 'gce-disruptive-1.1': - 'gce-disruptive-1.1':
timeout: 180 timeout: 180
description: 'Run disruptive E2E tests on GCE from the current release branch.' description: 'Run disruptive E2E tests on GCE from the current release branch.'
- 'gce-scalability-1.1':
timeout: 210
description: 'Run scalability E2E tests on GCE from the current release branch.'
jobs: jobs:
- 'kubernetes-e2e-{suffix}' - 'kubernetes-e2e-{suffix}'