Merge pull request #45493 from shyamjvs/yolo

Automatic merge from submit-queue (batch tested with PRs 44727, 45409, 44968, 45122, 45493) Fix gcloud retries cmd to rightly capture return code Fixes https://github.com/kubernetes/kubernetes/issues/45489 Seems like the issue was in doing this: ``` local var=$(cmd) local ret_code=$? #This actually captures return code of "local" above and not "cmd" ``` cc @wojtek-t @gmarek

Merge pull request #45493 from shyamjvs/yolo
c4eeb238 · Kubernetes Submit Queue · GitHub · a3cf8b95 · 2e800eef · c4eeb238
Commit c4eeb238 authored May 08, 2017 by Kubernetes Submit Queue Committed by GitHub May 08, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

util.sh test/kubemark/gce/util.sh +4 -3

No files found.
--- a/test/kubemark/gce/util.sh
+++ b/test/kubemark/gce/util.sh
@@ -20,10 +20,10 @@
 function run-gcloud-compute-with-retries {
  RETRIES="${RETRIES:-3}"
  for attempt in $(seq 1 ${RETRIES}); do
-    local -r gcloud_result=$(gcloud compute "$@" 2>&1)
-    local -r ret_val="$?"
+    # We don't use 'local' to declare gcloud_result as then ret_val always gets value 0.
+    gcloud_result=$(gcloud compute "$@" 2>&1) || local ret_val="$?"
    echo "${gcloud_result}"
-    if [[ "${ret_val}" -ne "0" ]]; then
+    if [[ "${ret_val:-0}" -ne "0" ]]; then
      if [[ $(echo "${gcloud_result}" | grep -c "already exists") -gt 0 ]]; then
        if [[ "${attempt}" == 1 ]]; then
          echo -e "${color_red}Failed to $1 $2 $3 as the resource hasn't been deleted from a previous run.${color_norm}" >& 2
@@ -78,6 +78,7 @@ function create-master-instance-with-resources {
    --disk "name=${MASTER_NAME}-pd,device-name=master-pd,mode=rw,boot=no,auto-delete=no"

  run-gcloud-compute-with-retries instances add-metadata "${MASTER_NAME}" \
+    ${GCLOUD_COMMON_ARGS} \
    --metadata-from-file startup-script="${KUBE_ROOT}/test/kubemark/resources/start-kubemark-master.sh"
  
  if [ "${EVENT_PD:-false}" == "true" ]; then