Merge pull request #18772 from ihmccreery/fix-nodes-3-1.1

Auto commit by PR queue bot
kubernetes · Dec 16, 2015 · 4b21d0b · 4b21d0b
2 parents d47ae93 + bb6e542
commit 4b21d0b
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
@@ -789,14 +789,20 @@ case ${JOB_NAME} in
 
   kubernetes-upgrade-gke-1.1-master-step1-deploy)
     configure_upgrade_step 'ci/latest-1.1' 'configured-in-master' 'upgrade-gke-1-1-master' 'kubernetes-jenkins-gke-upgrade'
+    # Starting in v1.2, NUM_MINIONS/NUM_NODES defaults to 3, so we have to deploy 3 here.
+    NUM_MINIONS=3
     ;;
 
   kubernetes-upgrade-gke-1.1-master-step4-e2e-old)
     configure_upgrade_step 'ci/latest-1.1' 'configured-in-master' 'upgrade-gke-1-1-master' 'kubernetes-jenkins-gke-upgrade'
+    # Starting in v1.2, NUM_MINIONS/NUM_NODES defaults to 3, so we have to deploy 3 here.
+    NUM_MINIONS=3
     ;;
 
   kubernetes-upgrade-gke-1.1-master-step6-e2e-old)
     configure_upgrade_step 'ci/latest-1.1' 'configured-in-master' 'upgrade-gke-1-1-master' 'kubernetes-jenkins-gke-upgrade'
+    # Starting in v1.2, NUM_MINIONS/NUM_NODES defaults to 3, so we have to deploy 3 here.
+    NUM_MINIONS=3
     ;;
 
   # kubernetes-upgrade-gke-1.0-current-release