Skip to content

K
k3s
Commit c9497657 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #28917 from wonderfly/gci-family

Automatic merge from submit-queue e2e-runner: Update the image family used for GCI canary test images @Amey-D @spxtr Can you review? @Random-Liu Heads up cc/ @kubernetes/goog-image
parents 6bb0995c f5d711a5
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
hack/jenkins/e2e-runner.sh
View file @ c9497657
...@@ -216,8 +216,8 @@ if [[ -n "${JENKINS_GCI_IMAGE_FAMILY:-}" ]]; then ...@@ -216,8 +216,8 @@ 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_FAMILY}" == "gci-preview-test" ]]; then if [[ "${JENKINS_GCI_IMAGE_FAMILY}" == "gci-canary-test" ]]; then
# The family "gci-preview-test" is reserved for a special type of GCI images # The family "gci-canary-test" is reserved for a special type of GCI images
# that are used to continuously validate Docker releases. # 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment