Configure upgrade jobs to use 7-step upgrade

Isaac Hollander McCreery · Isaac Hollander McCreery · commit 92993f4cb9cd · 2015-12-08T16:43:11.000-08:00
diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
@@ -427,36 +427,36 @@ case ${JOB_NAME} in
   # Test upgrades from the latest release-1.0 build to the latest current
   # release build.
   #
-  # Configurations for step2, step4, and step6 live in the current release
+  # Configurations for step2, step3, step5, and step7 live in the current release
   # branch.
 
   kubernetes-upgrade-gke-1.0-current-release-step1-deploy)
     configure_upgrade_step 'ci/latest-1.0' 'configured-in-current-release-branch' 'upgrade-gke-1-0-current-release' 'kubernetes-jenkins-gke-upgrade'
     ;;
 
-  kubernetes-upgrade-gke-1.0-current-release-step3-e2e-old)
+  kubernetes-upgrade-gke-1.0-current-release-step4-e2e-old)
     configure_upgrade_step 'ci/latest-1.0' 'configured-in-current-release-branch' 'upgrade-gke-1-0-current-release' 'kubernetes-jenkins-gke-upgrade'
     ;;
 
-  kubernetes-upgrade-gke-1.0-current-release-step5-e2e-old)
+  kubernetes-upgrade-gke-1.0-current-release-step6-e2e-old)
     configure_upgrade_step 'ci/latest-1.0' 'configured-in-current-release-branch' 'upgrade-gke-1-0-current-release' 'kubernetes-jenkins-gke-upgrade'
     ;;
 
   # kubernetes-upgrade-gke-1.0-master
   #
   # Test upgrades from the latest release-1.0 build to the latest master build.
   #
-  # Configurations for step2, step4, and step6 live in master.
+  # Configurations for step2, step3, step5, and step7 live in master.
 
   kubernetes-upgrade-gke-1.0-master-step1-deploy)
     configure_upgrade_step 'ci/latest-1.0' 'configured-in-master' 'upgrade-gke-1-0-master' 'kubernetes-jenkins-gke-upgrade'
     ;;
 
-  kubernetes-upgrade-gke-1.0-master-step3-e2e-old)
+  kubernetes-upgrade-gke-1.0-master-step4-e2e-old)
     configure_upgrade_step 'ci/latest-1.0' 'configured-in-master' 'upgrade-gke-1-0-master' 'kubernetes-jenkins-gke-upgrade'
     ;;
 
-  kubernetes-upgrade-gke-1.0-master-step5-e2e-old)
+  kubernetes-upgrade-gke-1.0-master-step6-e2e-old)
     configure_upgrade_step 'ci/latest-1.0' 'configured-in-master' 'upgrade-gke-1-0-master' 'kubernetes-jenkins-gke-upgrade'
     ;;
 esac
