Merge pull request #16917 from piosz/e2e-setup

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-11-06 10:01:22 -08:00
commit fbee1b59d0

View File

@ -136,7 +136,7 @@ AWS_REQUIRED_SKIP_TESTS=(
# Tests which kills or restarts components and/or nodes.
DISRUPTIVE_TESTS=(
"Autoscaling\sSuite"
"Autoscaling\sSuite.*scale\scluster"
"DaemonRestart"
"Etcd\sfailure"
"Nodes\sResize"
@ -161,8 +161,8 @@ GCE_FLAKY_TESTS=(
# comments below, and for poorly implemented tests, please quote the
# issue number tracking speed improvements.
GCE_SLOW_TESTS=(
# Temporary disable autoscaling suite due to heapster configuration issues.
#"Autoscaling\sSuite"
# TODO: add deployment test here once it will become stable
"Autoscaling\sSuite.*via\sreplicationController"
# Before enabling this loadbalancer test in any other test list you must
# make sure the associated project has enough quota. At the time of this
# writing a GCE project is allowed 3 backend services by default. This