Merge pull request #12783 from piosz/autoscaling_e2e

Enabled Autoscaling e2e test for Jenkins flaky job
This commit is contained in:
Marek Grabowski
2015-08-17 11:23:28 +02:00
3 changed files with 26 additions and 10 deletions

View File

@@ -96,6 +96,7 @@ GCE_DEFAULT_SKIP_TESTS=(
# The following tests are known to be flaky, and are thus run only in their own
# -flaky- build variants.
GCE_FLAKY_TESTS=(
"Autoscaling"
"ResourceUsage"
)
@@ -186,6 +187,8 @@ case ${JOB_NAME} in
)"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-flaky"}
: ${PROJECT:="k8s-jkns-e2e-gce-flaky"}
# Override GCE default for cluster size autoscaling purposes.
ENABLE_CLUSTER_MONITORING="googleinfluxdb"
;;
# Runs all non-flaky tests on GCE in parallel.