From 21b1453f2508526e5fc85d09d40881f8f5368a1f Mon Sep 17 00:00:00 2001
From: Zach Loafman <zml@google.com>
Date: Fri, 21 Aug 2015 13:21:53 -0700
Subject: [PATCH] Revert "Promoted Autoscaling e2e tests to standard suite"

---
 hack/jenkins/e2e.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
index e1fdd11e55..68aa8b755c 100755
--- a/hack/jenkins/e2e.sh
+++ b/hack/jenkins/e2e.sh
@@ -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"
     "DaemonRestart"
     "ResourceUsage"
     )
@@ -188,6 +189,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.