Merge pull request kubernetes#16459 from mikedanese/enable-exp

enable deployment and daemonset in gce upgrade tests
amuwxf · Oct 30, 2015 · 88008de · 88008de
2 parents 5629632 + 3343522
commit 88008de
Showing 1 changed file with 24 additions and 12 deletions.
diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
@@ -918,8 +918,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)
@@ -932,8 +933,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)
@@ -953,8 +955,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)
@@ -967,8 +970,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)
@@ -986,8 +990,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)
@@ -1006,8 +1011,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
@@ -1030,8 +1036,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)
@@ -1047,8 +1054,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)
@@ -1067,8 +1075,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)
@@ -1084,8 +1093,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)
@@ -1104,8 +1114,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)
@@ -1126,8 +1137,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}
     ;;