From 2a06a8f416152618e298df9d05bc55339a0c5cb5 Mon Sep 17 00:00:00 2001 From: David McMahon Date: Tue, 9 Aug 2016 16:52:53 -0700 Subject: [PATCH] Figure out where kubernetes is in the various scopes this is called from. --- hack/jenkins/upload-to-gcs.sh | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/hack/jenkins/upload-to-gcs.sh b/hack/jenkins/upload-to-gcs.sh index f019e74ec49..72ce51bf71a 100755 --- a/hack/jenkins/upload-to-gcs.sh +++ b/hack/jenkins/upload-to-gcs.sh @@ -63,20 +63,39 @@ readonly gcs_acl="public-read" readonly results_url=${gcs_build_path//"gs:/"/"https://console.cloud.google.com/storage/browser"} readonly timestamp=$(date +%s) +######################################################################### +# $0 is called from different contexts so figure out where kubernetes is. +# Sets non-exported global kubernetes_base_path and defaults to "." +function set_kubernetes_base_path () { + for kubernetes_base_path in kubernetes go/src/k8s.io/kubernetes .; do + # Pick a canonical item to find in a kubernetes tree which could be a + # raw source tree or an expanded tarball. + + [[ -f ${kubernetes_base_path}/cluster/common.sh ]] && break + done +} + ######################################################################### # Try to discover the kubernetes version. # prints version function find_version() { + ( + # Where are we? + # This could be set in the global scope at some point if we need to + # discover the kubernetes path elsewhere. + set_kubernetes_base_path + + cd ${kubernetes_base_path} + if [[ -e "version" ]]; then cat version elif [[ -e "hack/lib/version.sh" ]]; then - ( export KUBE_ROOT="." source "hack/lib/version.sh" kube::version::get_version_vars echo "${KUBE_GIT_VERSION-}" - ) fi + ) } function upload_version() {