github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Revert "Revert "e2e-runner.sh: don't overwrite readonly var""
This commit is contained in:
Dawn Chen 2016-06-10 18:18:07 -07:00 committed by GitHub
commit 507d7e5565
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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