github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27894 from wonderfly/image_family

Browse Source 
Automatic merge from submit-queue

e2e-runner: Get rid of the uses of JENKINS_GCI_IMAGE_TYPE

It's now `JENKINS_GCI_IMAGE_FAMILY`.

@fejta This is a quick bugfix which should have been done in #27083 . Can you review?

cc/ @kubernetes/goog-image The GCI e2e jobs are failing due to this.
This commit is contained in:
k8s-merge-robot
2016-06-22 19:59:08 -07:00
committed by GitHub
parent 89bb77d3e8 cc8aaf195d
commit 443dab4855
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,7 +165,9 @@ if [[ -n "${JENKINS_GCI_IMAGE_FAMILY:-}" ]]; then
export KUBE_GCE_MASTER_PROJECT="${GCI_STAGING_PROJECT}" export KUBE_GCE_MASTER_PROJECT="${GCI_STAGING_PROJECT}"
export KUBE_GCE_MASTER_IMAGE="$(get_latest_gci_image "${GCI_STAGING_PROJECT}" "${JENKINS_GCI_IMAGE_FAMILY}")" export KUBE_GCE_MASTER_IMAGE="$(get_latest_gci_image "${GCI_STAGING_PROJECT}" "${JENKINS_GCI_IMAGE_FAMILY}")"
export KUBE_OS_DISTRIBUTION="gci" export KUBE_OS_DISTRIBUTION="gci"
if [[ "${JENKINS_GCI_IMAGE_TYPE}" == preview-test ]]; then if [[ "${JENKINS_GCI_IMAGE_FAMILY}" == "gci-preview-test" ]]; then
# The family "gci-preview-test" is reserved for a special type of GCI images
# that are used to continuously validate Docker releases.
export KUBE_GCI_DOCKER_VERSION="$(get_latest_docker_release)" export KUBE_GCI_DOCKER_VERSION="$(get_latest_docker_release)"
fi fi
fi fi