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

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

Merge pull request #45821 from shyamjvs/minor-km-fix
9ddd51f4 · Kubernetes Submit Queue · GitHub · 9590b94f · 87cde074 · 9ddd51f4
Commit 9ddd51f4 authored May 15, 2017 by Kubernetes Submit Queue Committed by GitHub May 15, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

util.sh test/kubemark/gce/util.sh +1 -1

No files found.
--- a/test/kubemark/gce/util.sh
+++ b/test/kubemark/gce/util.sh
@@ -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