From 0d105ad5483a4909781264fafa4a311500132d6b Mon Sep 17 00:00:00 2001 From: Piotr Szczesniak Date: Mon, 23 Nov 2015 10:22:13 +0100 Subject: [PATCH] Enabled HPA e2e tests for 1.1 release --- hack/jenkins/e2e.sh | 4 ---- test/e2e/horizontal_pod_autoscaling.go | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index afa66752230..2fdc3c51f52 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -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 diff --git a/test/e2e/horizontal_pod_autoscaling.go b/test/e2e/horizontal_pod_autoscaling.go index 36a4204ccc0..bf285824b9d 100644 --- a/test/e2e/horizontal_pod_autoscaling.go +++ b/test/e2e/horizontal_pod_autoscaling.go @@ -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) }) })