From 33435225461e90b367a5c22728cb0c11759b32ad Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@gmail.com>
Date: Wed, 28 Oct 2015 15:25:46 -0700
Subject: [PATCH] enable deployment and daemonset in gce upgrade tests

---
 hack/jenkins/e2e.sh | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
index 97ea760f498..1ea3fa65982 100755
--- a/hack/jenkins/e2e.sh
+++ b/hack/jenkins/e2e.sh
@@ -915,8 +915,9 @@ case ${JOB_NAME} in
     : ${E2E_UP:="true"}
     : ${E2E_TEST:="false"}
     : ${E2E_DOWN:="false"}
-    : ${ENABLE_EXPERIMENTAL_API:=true}
     : ${NUM_MINIONS:=5}
+    : ${ENABLE_DEPLOYMENTS:=true}
+    : ${ENABLE_DAEMONSETS:=true}
     ;;
 
   kubernetes-upgrade-gce-step2-upgrade-master)
@@ -929,8 +930,9 @@ case ${JOB_NAME} in
     : ${E2E_TEST:="true"}
     : ${E2E_DOWN:="false"}
     : ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-master"}
-    : ${ENABLE_EXPERIMENTAL_API:=true}
     : ${NUM_MINIONS:=5}
+    : ${ENABLE_DEPLOYMENTS:=true}
+    : ${ENABLE_DAEMONSETS:=true}
     ;;
 
   kubernetes-upgrade-gce-step3-e2e-old)
@@ -950,8 +952,9 @@ case ${JOB_NAME} in
           ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \
           ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
           )"}
-    : ${ENABLE_EXPERIMENTAL_API:=true}
     : ${NUM_MINIONS:=5}
+    : ${ENABLE_DEPLOYMENTS:=true}
+    : ${ENABLE_DAEMONSETS:=true}
     ;;
 
   kubernetes-upgrade-gce-step4-upgrade-cluster)
@@ -964,8 +967,9 @@ case ${JOB_NAME} in
     : ${E2E_TEST:="true"}
     : ${E2E_DOWN:="false"}
     : ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-cluster"}
-    : ${ENABLE_EXPERIMENTAL_API:=true}
     : ${NUM_MINIONS:=5}
+    : ${ENABLE_DEPLOYMENTS:=true}
+    : ${ENABLE_DAEMONSETS:=true}
     ;;
 
   kubernetes-upgrade-gce-step5-e2e-old)
@@ -983,8 +987,9 @@ case ${JOB_NAME} in
           ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \
           ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
           )"}
-    : ${ENABLE_EXPERIMENTAL_API:=true}
     : ${NUM_MINIONS:=5}
+    : ${ENABLE_DEPLOYMENTS:=true}
+    : ${ENABLE_DAEMONSETS:=true}
     ;;
 
   kubernetes-upgrade-gce-step6-e2e-new)
@@ -1003,8 +1008,9 @@ case ${JOB_NAME} in
           ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
           ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \
           )"}
-    : ${ENABLE_EXPERIMENTAL_API:=true}
     : ${NUM_MINIONS:=5}
+    : ${ENABLE_DEPLOYMENTS:=true}
+    : ${ENABLE_DAEMONSETS:=true}
     ;;
 
   # kubernetes-upgrade-gce-1.0-1.1
@@ -1027,8 +1033,9 @@ case ${JOB_NAME} in
     : ${E2E_TEST:="false"}
     : ${E2E_DOWN:="false"}
     : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"}
-    : ${ENABLE_EXPERIMENTAL_API:=true}
     : ${NUM_MINIONS:=5}
+    : ${ENABLE_DEPLOYMENTS:=true}
+    : ${ENABLE_DAEMONSETS:=true}
     ;;
 
   kubernetes-upgrade-1.0-1.1-gce-step2-upgrade-master)
@@ -1044,8 +1051,9 @@ case ${JOB_NAME} in
     : ${E2E_DOWN:="false"}
     : ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-master --upgrade-target=ci/latest-1.1"}
     : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"}
-    : ${ENABLE_EXPERIMENTAL_API:=true}
     : ${NUM_MINIONS:=5}
+    : ${ENABLE_DEPLOYMENTS:=true}
+    : ${ENABLE_DAEMONSETS:=true}
     ;;
 
   kubernetes-upgrade-1.0-1.1-gce-step3-e2e-old)
@@ -1064,8 +1072,9 @@ case ${JOB_NAME} in
           ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
           )"}
     : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"}
-    : ${ENABLE_EXPERIMENTAL_API:=true}
     : ${NUM_MINIONS:=5}
+    : ${ENABLE_DEPLOYMENTS:=true}
+    : ${ENABLE_DAEMONSETS:=true}
     ;;
 
   kubernetes-upgrade-1.0-1.1-gce-step4-upgrade-cluster)
@@ -1081,8 +1090,9 @@ case ${JOB_NAME} in
     : ${E2E_DOWN:="false"}
     : ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-cluster --upgrade-target=ci/latest-1.1"}
     : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"}
-    : ${ENABLE_EXPERIMENTAL_API:=true}
     : ${NUM_MINIONS:=5}
+    : ${ENABLE_DEPLOYMENTS:=true}
+    : ${ENABLE_DAEMONSETS:=true}
     ;;
 
   kubernetes-upgrade-1.0-1.1-gce-step5-e2e-old)
@@ -1101,8 +1111,9 @@ case ${JOB_NAME} in
           ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
           )"}
     : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"}
-    : ${ENABLE_EXPERIMENTAL_API:=true}
     : ${NUM_MINIONS:=5}
+    : ${ENABLE_DEPLOYMENTS:=true}
+    : ${ENABLE_DAEMONSETS:=true}
     ;;
 
   kubernetes-upgrade-1.0-1.1-gce-step6-e2e-new)
@@ -1123,8 +1134,9 @@ case ${JOB_NAME} in
           ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \
           )"}
     : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"}
-    : ${ENABLE_EXPERIMENTAL_API:=true}
     : ${NUM_MINIONS:=5}
+    : ${ENABLE_DEPLOYMENTS:=true}
+    : ${ENABLE_DAEMONSETS:=true}
     ;;