Skip to content

K
k3s
Commit 507d7e55 authored by Dawn Chen's avatar Dawn Chen Committed by GitHub
Browse files
Options

Merge pull request #27226 from kubernetes/revert-27222-revert-27217-server-version

Revert "Revert "e2e-runner.sh: don't overwrite readonly var""
parents bf85ecda f04d3ebd
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
hack/jenkins/e2e-runner.sh
View file @ 507d7e55
...@@ -34,13 +34,12 @@ function fetch_output_tars() { ...@@ -34,13 +34,12 @@ function fetch_output_tars() {
} }
function fetch_server_version_tars() { function fetch_server_version_tars() {
local -r build_version="$(gcloud ${CMD_GROUP:-} container get-server-config --project=${PROJECT} --zone=${ZONE} --format='value(defaultClusterVersion)')" local -r server_version="$(gcloud ${CMD_GROUP:-} container get-server-config --project=${PROJECT} --zone=${ZONE} --format='value(defaultClusterVersion)')"
# Use latest build of the server version's branch for test files. # Use latest build of the server version's branch for test files.
fetch_published_version_tars "ci/latest-${build_version:0:3}" fetch_published_version_tars "ci/latest-${server_version:0:3}"
# Unset cluster api version; we want to use server default for the cluster # Unset cluster api version; we want to use server default for the cluster
# version. # version.
unset CLUSTER_API_VERSION unset CLUSTER_API_VERSION
unpack_binaries
} }
# Use a published version like "ci/latest" (default), "release/latest", # Use a published version like "ci/latest" (default), "release/latest",
......
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