From 5ac20da16cd8e2ba91b2fe282348cead8d379009 Mon Sep 17 00:00:00 2001
From: Isaac Hollander McCreery <ihmccreery@google.com>
Date: Thu, 28 Jan 2016 08:56:27 -0800
Subject: [PATCH] Move HPA e2es into the default slow suite, and add
 [Feature:ClusterSizeAutoscaling] and [Feature:InitialResources]

---
 hack/jenkins/e2e.sh                    | 3 ++-
 test/e2e/cluster_size_autoscaling.go   | 7 ++++++-
 test/e2e/horizontal_pod_autoscaling.go | 3 ++-
 test/e2e/initial_resources.go          | 6 +++++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
index 052636f447c..89f13e1a82b 100755
--- a/hack/jenkins/e2e.sh
+++ b/hack/jenkins/e2e.sh
@@ -351,7 +351,8 @@ case ${JOB_NAME} in
   kubernetes-e2e-gce-autoscaling)
     : ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-autoscaling"}
     : ${E2E_NETWORK:="e2e-autoscaling"}
-    : ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Feature:Autoscaling\]"}
+    : ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Feature:ClusterSizeAutoscaling\]|\[Feature:InitialResources\] \
+                           --ginkgo.skip=\[Flaky\]"}
     : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-autoscaling"}
     : ${PROJECT:="k8s-jnks-e2e-gce-autoscaling"}
     : ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
diff --git a/test/e2e/cluster_size_autoscaling.go b/test/e2e/cluster_size_autoscaling.go
index 8349f8369fa..e7e3607db95 100644
--- a/test/e2e/cluster_size_autoscaling.go
+++ b/test/e2e/cluster_size_autoscaling.go
@@ -32,7 +32,12 @@ const (
 	scaleDownTimeout = 30 * time.Minute
 )
 
-var _ = Describe("Autoscaling [Skipped]", func() {
+// [Feature:ClusterSizeAutoscaling]: Cluster size autoscaling is experimental
+// and require Google Cloud Monitoring to be enabled, so these tests are not
+// run by default.
+//
+// These tests take ~20 minutes to run each.
+var _ = Describe("Cluster size autoscaling [Feature:ClusterSizeAutoscaling] [Slow]", func() {
 	f := NewFramework("autoscaling")
 	var nodeCount int
 	var coresPerNode int
diff --git a/test/e2e/horizontal_pod_autoscaling.go b/test/e2e/horizontal_pod_autoscaling.go
index 135daaadb04..09d8467f783 100644
--- a/test/e2e/horizontal_pod_autoscaling.go
+++ b/test/e2e/horizontal_pod_autoscaling.go
@@ -31,7 +31,8 @@ const (
 	subresource    = "scale"
 )
 
-var _ = Describe("Horizontal pod autoscaling (scale resource: CPU) [Feature:Autoscaling]", func() {
+// These tests take ~20 minutes each.
+var _ = Describe("Horizontal pod autoscaling (scale resource: CPU) [Slow]", func() {
 	var rc *ResourceConsumer
 	f := NewFramework("horizontal-pod-autoscaling")
 
diff --git a/test/e2e/initial_resources.go b/test/e2e/initial_resources.go
index 26a37c539da..a23b3e7f67a 100644
--- a/test/e2e/initial_resources.go
+++ b/test/e2e/initial_resources.go
@@ -26,7 +26,11 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 )
 
-var _ = Describe("Initial Resources [Skipped] ", func() {
+// [Feature:InitialResources]: Initial resources is an experimental feature, so
+// these tests are not run by default.
+//
+// Flaky issue #20272
+var _ = Describe("Initial Resources [Feature:InitialResources] [Flaky]", func() {
 	f := NewFramework("initial-resources")
 
 	It("should set initial resources based on historical data", func() {