scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25042 from wonderfly/trusty_beta_to_1_2

Browse Source 
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?
This commit is contained in:
k8s-merge-robot
2016-05-06 04:51:57 -07:00
parent 66ef87347e f355222060
commit a64ef4d3df
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hack/jenkins/e2e-runner.sh
View File

@@ -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"