github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-01 17:29:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #46938 from shyamjvs/no-reprinting-gcloud-result

Browse Source 
Automatic merge from submit-queue

Avoid double printing output of gcloud commands in kubemark

Just noticed we were unnecessarily echoing the result again.

/cc @wojtek-t
This commit is contained in:
Kubernetes Submit Queue
2017-06-06 04:07:55 -07:00
committed by GitHub
parent 475e479c11 163f1de5ed
commit c0407972e9
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/kubemark/gce/util.sh
View File

@@ -24,7 +24,6 @@ function run-gcloud-compute-with-retries {
# We don't use 'local' to declare gcloud_result as then ret_val always gets value 0. # We don't use 'local' to declare gcloud_result as then ret_val always gets value 0.
# We use tee to output to &5 (redirected to stdout) while also storing it in the variable. # We use tee to output to &5 (redirected to stdout) while also storing it in the variable.
gcloud_result=$(gcloud compute "$@" 2>&1 | tee >(cat - >&5)) || local ret_val="$?" gcloud_result=$(gcloud compute "$@" 2>&1 | tee >(cat - >&5)) || local ret_val="$?"
echo "${gcloud_result}"
if [[ "${ret_val:-0}" -ne "0" ]]; then if [[ "${ret_val:-0}" -ne "0" ]]; then
if [[ $(echo "${gcloud_result}" | grep -c "already exists") -gt 0 ]]; then if [[ $(echo "${gcloud_result}" | grep -c "already exists") -gt 0 ]]; then
if [[ "${attempt}" == 1 ]]; then if [[ "${attempt}" == 1 ]]; then