From f3552220606dd61f3a1478fd52e79dadde4f27c3 Mon Sep 17 00:00:00 2001
From: Daniel Wang <wonderfly@google.com>
Date: Fri, 29 Apr 2016 11:10:53 -0700
Subject: [PATCH] e2e-runner.sh: Ability to fetch multiple types of Trusty
 images

---
 hack/jenkins/e2e-runner.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hack/jenkins/e2e-runner.sh b/hack/jenkins/e2e-runner.sh
index c7016d7d1b4..7921aff0025 100755
--- a/hack/jenkins/e2e-runner.sh
+++ b/hack/jenkins/e2e-runner.sh
@@ -174,9 +174,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"