Merge pull request #17639 from piosz/hpa-e2e

Enabled HPA e2e tests for 1.1 release
pull/6/head
Jerzy Szczepkowski 2015-11-23 15:08:59 +01:00
commit d6e27d0620
2 changed files with 2 additions and 6 deletions

View File

@ -126,7 +126,6 @@ REBOOT_SKIP_TESTS=(
# Specialized tests which should be skipped by default for projects.
GCE_DEFAULT_SKIP_TESTS=(
"${REBOOT_SKIP_TESTS[@]}"
"Autoscaling\sSuite"
"Reboot"
"ServiceLoadBalancer"
)
@ -161,7 +160,6 @@ AWS_REQUIRED_SKIP_TESTS=(
# Tests which kills or restarts components and/or nodes.
DISRUPTIVE_TESTS=(
"Autoscaling\sSuite.*scale\scluster"
"DaemonRestart"
"Etcd\sfailure"
"Nodes\sResize"
@ -185,8 +183,6 @@ GCE_FLAKY_TESTS=(
# comments below, and for poorly implemented tests, please quote the
# issue number tracking speed improvements.
GCE_SLOW_TESTS=(
# 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

View File

@ -50,10 +50,10 @@ var _ = Describe("Horizontal pod autoscaling", func() {
})
// CPU tests via replication controllers
It(fmt.Sprintf(titleUp, "[Autoscaling Suite]", kindRC), func() {
It(fmt.Sprintf(titleUp, "[Skipped][Autoscaling Suite]", kindRC), func() {
scaleUp("rc", kindRC, rc, f)
})
It(fmt.Sprintf(titleDown, "[Autoscaling Suite]", kindRC), func() {
It(fmt.Sprintf(titleDown, "[Skipped][Autoscaling Suite]", kindRC), func() {
scaleDown("rc", kindRC, rc, f)
})
})