Commit c0407972 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

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

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
parents 475e479c 163f1de5
...@@ -24,7 +24,6 @@ function run-gcloud-compute-with-retries { ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment