Merge pull request kubernetes#22890 from ihmccreery/1.1-fix-upgrades

Isaac Hollander McCreery · Isaac Hollander McCreery · commit 7ab22507804f · 2016-03-11T17:28:27.000-08:00
Fix upgrade job on 1.1; can't have period in cluster name
diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
@@ -1006,23 +1006,23 @@ case ${JOB_NAME} in
   # TODO(ihmccreery) When we release v1.2.0, these jobs will need to migrate to the release-1.2 branch.
 
   kubernetes-upgrade-gke-stable-1.2-step1-deploy)
-    configure_upgrade_step 'release/stable-1.1' 'ci/latest-1.1' 'upgrade-gke-stable-1.2' 'kubernetes-jenkins-gke-upgrade'
+    configure_upgrade_step 'release/stable-1.1' 'ci/latest-1.1' 'upgrade-gke-stable-1-2' '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
     # Starting in v1.2, GKE defaults to deploying to n1-standard-2, and some tests require that.
     MINION_SIZE='n1-standard-2'
     ;;
 
   kubernetes-upgrade-gke-stable-1.2-step4-e2e-old)
-    configure_upgrade_step 'release/stable-1.1' 'ci/latest-1.1' 'upgrade-gke-stable-1.2' 'kubernetes-jenkins-gke-upgrade'
+    configure_upgrade_step 'release/stable-1.1' 'ci/latest-1.1' 'upgrade-gke-stable-1-2' '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
     # Starting in v1.2, GKE defaults to deploying to n1-standard-2, and some tests require that.
     MINION_SIZE='n1-standard-2'
     ;;
 
   kubernetes-upgrade-gke-stable-1.2-step6-e2e-old)
-    configure_upgrade_step 'release/stable-1.1' 'ci/latest-1.1' 'upgrade-gke-stable-1.2' 'kubernetes-jenkins-gke-upgrade'
+    configure_upgrade_step 'release/stable-1.1' 'ci/latest-1.1' 'upgrade-gke-stable-1-2' '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
     # Starting in v1.2, GKE defaults to deploying to n1-standard-2, and some tests require that.
