Merge pull request #14776 from brendandburns/fixer2

test/kubemark/start-kubemark.sh

@@ -47,19 +47,19 @@ gcloud compute instances create ${MASTER_NAME} \
     --scopes "storage-ro,compute-rw,logging-write" \
     --disk "name=${MASTER_NAME}-pd,device-name=master-pd,mode=rw,boot=no,auto-delete=no"
 
-MASTER_IP=`gcloud compute instances describe hollow-cluster-master | grep networkIP | cut -f2 -d":" | sed "s/ //g"`
+MASTER_IP=`gcloud compute instances describe hollow-cluster-master --zone=${ZONE} | grep networkIP | cut -f2 -d":" | sed "s/ //g"`
 
-until gcloud compute ssh hollow-cluster-master --command="ls" &> /dev/null; do
+until gcloud compute ssh --zone=${ZONE} hollow-cluster-master --command="ls" &> /dev/null; do
   sleep 1
 done
 
-gcloud compute copy-files \
+gcloud compute copy-files --zone=${ZONE} \
   ${KUBE_ROOT}/_output/release-tars/kubernetes-server-linux-amd64.tar.gz \
   ${KUBE_ROOT}/test/kubemark/start-kubemark-master.sh \
   ${KUBE_ROOT}/test/kubemark/configure-kubectl.sh \
   hollow-cluster-master:~
 
-gcloud compute ssh hollow-cluster-master --command="chmod a+x configure-kubectl.sh && chmod a+x start-kubemark-master.sh && ./start-kubemark-master.sh"
+gcloud compute ssh --zone=${ZONE} hollow-cluster-master --command="chmod a+x configure-kubectl.sh && chmod a+x start-kubemark-master.sh && ./start-kubemark-master.sh"
 
 sed "s/##masterip##/\"${MASTER_IP}\"/g" ${KUBE_ROOT}/test/kubemark/hollow-kubelet_template.json > ${KUBE_ROOT}/test/kubemark/hollow-kubelet.json
 sed -i'' -e "s/##numreplicas##/${NUM_MINIONS:-10}/g" ${KUBE_ROOT}/test/kubemark/hollow-kubelet.json