github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #45821 from shyamjvs/minor-km-fix

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 45070, 45821, 45732, 45494, 45789)

Minor fix in run-gcloud-compute-with-retries output piping

To work with older versions of bash.

cc @wojtek-t @gmarek
This commit is contained in:
Kubernetes Submit Queue
2017-05-15 07:49:51 -07:00
committed by GitHub
parent 9590b94f7c 87cde074f8
commit 9ddd51f476
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ function run-gcloud-compute-with-retries {
exec 5>&1 # Duplicate &1 to &5 for use below.
# 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.
gcloud_result=$(gcloud compute "$@" |& 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 [[ $(echo "${gcloud_result}" | grep -c "already exists") -gt 0 ]]; then