scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set CLOUDSDK_CONFIG to an explicit consistent value in e2e-runner

Browse Source
This commit is contained in:
Jeff Grafton
2016-08-24 00:27:05 -07:00
parent 8e168f8d5a
commit 12ea9cb1db
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,6 +48,10 @@ STAGE_KUBEMARK="KUBEMARK"
: ${KUBE_GCS_RELEASE_BUCKET:="kubernetes-release"} : ${KUBE_GCS_RELEASE_BUCKET:="kubernetes-release"}
: ${KUBE_GCS_DEV_RELEASE_BUCKET:="kubernetes-release-dev"} : ${KUBE_GCS_DEV_RELEASE_BUCKET:="kubernetes-release-dev"}
# Explicitly set config path so staging gcloud (if installed_ uses the same path
# as release
export CLOUDSDK_CONFIG="${WORKSPACE}/.config/gcloud"
# record_command runs the command and records its output/error messages in junit format # record_command runs the command and records its output/error messages in junit format
# it expects the first argument to be the class and the second to be the name of the command # it expects the first argument to be the class and the second to be the name of the command
# Example: # Example:
@@ -228,8 +232,6 @@ if [[ -n "${CLOUDSDK_BUCKET:-}" ]]; then
mv ~/$(basename "${CLOUDSDK_BUCKET}") ~/repo mv ~/$(basename "${CLOUDSDK_BUCKET}") ~/repo
export CLOUDSDK_COMPONENT_MANAGER_SNAPSHOT_URL=file://${HOME}/repo/components-2.json export CLOUDSDK_COMPONENT_MANAGER_SNAPSHOT_URL=file://${HOME}/repo/components-2.json
install_google_cloud_sdk_tarball ~/repo/google-cloud-sdk.tar.gz ~/cloudsdk install_google_cloud_sdk_tarball ~/repo/google-cloud-sdk.tar.gz ~/cloudsdk
# TODO: is this necessary? this won't work inside Docker currently.
export CLOUDSDK_CONFIG=/var/lib/jenkins/.config/gcloud
fi fi
# GCI specific settings. # GCI specific settings.