From efc84378b8f4d4238308d70ab5891b47aafd905e Mon Sep 17 00:00:00 2001
From: Shyam Jeedigunta <shyamjvs@google.com>
Date: Mon, 8 May 2017 16:29:07 +0200
Subject: [PATCH 1/2] Fix gcloud retries cmd to rightly capture return code

---
 test/kubemark/gce/util.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/kubemark/gce/util.sh b/test/kubemark/gce/util.sh
index 8e96268676d..620aa05405f 100644
--- 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

From 2e800eef203bbe2d36f7f9cbc42c35a0ff66926e Mon Sep 17 00:00:00 2001
From: Shyam Jeedigunta <shyamjvs@google.com>
Date: Mon, 8 May 2017 20:44:20 +0200
Subject: [PATCH 2/2] Fix add-metadata command for kubemark master

---
 test/kubemark/gce/util.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/kubemark/gce/util.sh b/test/kubemark/gce/util.sh
index 620aa05405f..067335046fa 100644
--- a/test/kubemark/gce/util.sh
+++ b/test/kubemark/gce/util.sh
@@ -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