From 35cf8cc76ce08f83d6ce368753b67a1792e3b19c Mon Sep 17 00:00:00 2001
From: Piotr Szczesniak <pszczesniak@google.com>
Date: Mon, 12 Oct 2015 11:30:47 +0200
Subject: [PATCH] Enabled InitialResources e2e in autoscaling suite

---
 cluster/gce/config-test.sh    | 2 +-
 hack/jenkins/e2e.sh           | 3 +++
 test/e2e/initial_resources.go | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh
index 01288b48ecc..47bbc070047 100755
--- a/cluster/gce/config-test.sh
+++ b/cluster/gce/config-test.sh
@@ -118,7 +118,7 @@ if [[ "${ENABLE_DEPLOYMENTS}" == "true" ]]; then
   ENABLE_EXPERIMENTAL_API=true
 fi
 
-ADMISSION_CONTROL=NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota
+ADMISSION_CONTROL="${KUBE_ADMISSION_CONTROL:-NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota}"
 
 # Optional: if set to true kube-up will automatically check for existing resources and clean them up.
 KUBE_UP_AUTOMATIC_CLEANUP=${KUBE_UP_AUTOMATIC_CLEANUP:-false}
diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
index ff7c2da6bf0..a3bd8883039 100755
--- a/hack/jenkins/e2e.sh
+++ b/hack/jenkins/e2e.sh
@@ -228,6 +228,7 @@ case ${JOB_NAME} in
     # Override GCE default for cluster size autoscaling purposes.
     ENABLE_CLUSTER_MONITORING="googleinfluxdb"
     ENABLE_HORIZONTAL_POD_AUTOSCALER="true"
+    ADMISSION_CONTROL="NamespaceLifecycle,InitialResources,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota"
     ;;
 
   # Runs the flaky tests on GCE, sequentially.
@@ -833,6 +834,8 @@ export NUM_MINIONS=${NUM_MINIONS:-}
 export PROJECT=${PROJECT:-}
 export JENKINS_PUBLISHED_VERSION=${JENKINS_PUBLISHED_VERSION:-'ci/latest'}
 
+export KUBE_ADMISSION_CONTROL=${ADMISSION_CONTROL:-}
+
 export KUBERNETES_PROVIDER=${KUBERNETES_PROVIDER}
 export PATH=${PATH}:/usr/local/go/bin
 export KUBE_SKIP_CONFIRMATIONS=y
diff --git a/test/e2e/initial_resources.go b/test/e2e/initial_resources.go
index e3850705b5e..2096e4958aa 100644
--- a/test/e2e/initial_resources.go
+++ b/test/e2e/initial_resources.go
@@ -28,7 +28,7 @@ import (
 var _ = Describe("Initial Resources", func() {
 	f := NewFramework("initial-resources")
 
-	It("[Skipped] should set initial resources based on historical data", func() {
+	It("[Skipped][Autoscaling Suite] should set initial resources based on historical data", func() {
 		cpu := 100
 		mem := 200
 		for i := 0; i < 10; i++ {