Merge pull request #25042 from wonderfly/trusty_beta_to_1_2

Automatic merge from submit-queue Update e2e-runner.sh so it can fetch multiple types of Trusty images Trusty beta images now work with k8s 1.2. @spxtr, @andyzheng0831 Can you review this?

Merge pull request #25042 from wonderfly/trusty_beta_to_1_2
a64ef4d3 · k8s-merge-robot · 66ef8734 · f3552220 · a64ef4d3
Commit a64ef4d3 authored May 06, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

e2e-runner.sh hack/jenkins/e2e-runner.sh +2 -2

No files found.
--- a/hack/jenkins/e2e-runner.sh
+++ b/hack/jenkins/e2e-runner.sh
@@ -184,9 +184,9 @@ if [[ -n "${CLOUDSDK_BUCKET:-}" ]]; then
 fi

 # We get the image project and name for Trusty dynamically.
-if [[ "${JENKINS_USE_TRUSTY_IMAGES:-}" =~ ^[yY]$ ]]; then
+if [[ -n "${JENKINS_TRUSTY_IMAGE_TYPE:-}" ]]; then
  trusty_image_project="$(get_trusty_image_project)"
-  trusty_image="$(get_latest_trusty_image "${trusty_image_project}" "dev")"
+  trusty_image="$(get_latest_trusty_image "${trusty_image_project}" "${JENKINS_TRUSTY_IMAGE_TYPE}")"
  export KUBE_GCE_MASTER_PROJECT="${trusty_image_project}"
  export KUBE_GCE_MASTER_IMAGE="${trusty_image}"
  export KUBE_OS_DISTRIBUTION="trusty"