github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #32938 from pmorie/gcloud-errs 

Automatic merge from submit-queue

Fix error message around gcloud calls in node e2e and gubernator

Fixes some janky error messages around gcloud calls.
pull/6/head
Kubernetes Submit Queue 2016-09-16 23:59:42 -07:00 committed by GitHub
parent 06fac3b09e 88acffcda1
commit 824763977d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/make-rules/test-e2e-node.sh
View File

@ -89,14 +89,14 @@ if [ $remote = true ] ; then
# Get the compute zone
zone=$(gcloud info --format='value(config.properties.compute.zone)')
if [[ $zone == "" ]]; then
echo "Could not find gcloud compute/zone when running:\ngcloud info --format='value(config.properties.compute.zone)'"
echo "Could not find gcloud compute/zone when running: \`gcloud info --format='value(config.properties.compute.zone)'\`"
exit 1
fi
# Get the compute project
project=$(gcloud info --format='value(config.project)')
if [[ $project == "" ]]; then
echo "Could not find gcloud project when running:\ngcloud info --format='value(config.project)'"
echo "Could not find gcloud project when running: \`gcloud info --format='value(config.project)'\`"
exit 1
fi

6
test/e2e_node/gubernator.sh
View File

@ -35,19 +35,19 @@ fi
# Check that user has gsutil
if [[ $(which gsutil) == "" ]]; then
echo "Could not find gsutil when running:\which gsutil"
echo "Could not find gsutil when running \`which gsutil\`"
exit 1
fi
# Check that user has gcloud
if [[ $(which gcloud) == "" ]]; then
echo "Could not find gcloud when running:\which gcloud"
echo "Could not find gcloud when running: \`which gcloud\`"
exit 1
fi
# Check that user has Credentialed Active account
if ! gcloud auth list | grep -q "ACTIVE"; then
echo "Could not find active account when running:\gcloud auth list"
echo "Could not find active account when running: \`gcloud auth list\`"
exit 1
fi