From cc8aaf195d1eefe4c2f87d544c92b00292113c89 Mon Sep 17 00:00:00 2001 From: Daniel Wang Date: Wed, 22 Jun 2016 13:02:48 -0700 Subject: [PATCH] e2e-runner: Get rid of the uses of JENKINS_GCI_IMAGE_TYPE It's now `JENKINS_GCI_IMAGE_FAMILY`. --- hack/jenkins/e2e-runner.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hack/jenkins/e2e-runner.sh b/hack/jenkins/e2e-runner.sh index 699a4f3fcd4..b779a963a94 100755 --- a/hack/jenkins/e2e-runner.sh +++ b/hack/jenkins/e2e-runner.sh @@ -165,7 +165,9 @@ if [[ -n "${JENKINS_GCI_IMAGE_FAMILY:-}" ]]; then 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_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)" fi fi