Fix binary detection on GKE

* kubectl is kubectl.sh in the e2es, so not needed in the path
* Use the environment variable, and try to make sure the preview
component is installed.
pull/6/head
Zach Loafman 2014-12-21 08:03:49 -08:00
parent 36cfc02c6c
commit b3ce311fd8
1 changed files with 5 additions and 10 deletions

View File

@ -69,16 +69,11 @@ function test-build-release() {
# Verify needed binaries exist.
function verify-prereqs() {
echo "... in verify-prereqs()" >&2
local cmd
# TODO(mbforbes): This assumes you have a "normal" gcloud installed even if
# you are setting one differently using ${GCLOUD}.
for cmd in gcloud kubectl; do
which "${cmd}" >/dev/null || {
echo "Can't find ${cmd} in PATH, please fix and retry. The Google Cloud "
echo "SDK can be downloaded from https://cloud.google.com/sdk/."
exit 1
${GCLOUD} preview --help >/dev/null 2>&1 || {
echo "Either the GCLOUD environment variable is wrong, or the 'preview' component"
echo "is not installed. (Fix with 'gcloud components update preview')"
}
done
}
# Instantiate a kubernetes cluster