[geode] branch support/1.12 updated: Pin winrm-cli to last working SHA. Modify is-windows-ready script. (#4739)

[on...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

onichols pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/support/1.12 by this push:
     new 5f6fffb  Pin winrm-cli to last working SHA. Modify is-windows-ready script. (#4739)
5f6fffb is described below

commit 5f6fffb1f473005553142ba0019a68b79a225a60
Author: Robert Houghton <rh...@pivotal.io>
AuthorDate: Wed Feb 26 15:15:30 2020 -0800

    Pin winrm-cli to last working SHA. Modify is-windows-ready script. (#4739)
    
    Authored-by: Robert Houghton <rh...@pivotal.io>
    (cherry picked from commit 449b752c766e4e66646be2846b3665b20d9f9a31)
---
 ci/scripts/create_instance.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ci/scripts/create_instance.sh b/ci/scripts/create_instance.sh
index 9ec7d61..b21ade0 100755
--- a/ci/scripts/create_instance.sh
+++ b/ci/scripts/create_instance.sh
@@ -160,16 +160,14 @@ if [[ -z "${WINDOWS_PREFIX}" ]]; then
 else
   # Set up ssh access for Windows systems
   echo -n "Setting windows password via gcloud."
-  INSTANCE_AGENT_READY_LINE="GCEWindowsAgent: GCE Agent Started"
   INSTANCE_SETUP_FINSHED_LINE="GCEInstanceSetup: Instance setup finished"
-  SCRAPE_COMMAND_INSTANCE_READY="gcloud compute instances get-serial-port-output ${INSTANCE_NAME} --zone=${ZONE} | grep \"${INSTANCE_AGENT_READY_LINE}\" | wc -l"
   SCRAPE_COMMAND_SETUP_FINSHED="gcloud compute instances get-serial-port-output ${INSTANCE_NAME} --zone=${ZONE} | grep \"${INSTANCE_SETUP_FINSHED_LINE}\" | wc -l"
 
   while true; do
     # Check that the instance agent has started at least 2x (first boot, plus activation)
     # and that the "GCEInstanceSetup" script completed
     echo -n "Waiting for startup scripts and windows activation to complete"
-    while [[ 2 -ne $(eval ${SCRAPE_COMMAND_INSTANCE_READY} 2> /dev/null) ]] || [[ 1 -ne $(eval ${SCRAPE_COMMAND_SETUP_FINSHED} 2> /dev/null) ]]; do
+    while [[ 1 -ne $(eval ${SCRAPE_COMMAND_SETUP_FINSHED} 2> /dev/null) ]]; do
       echo -n .
       sleep 5
     done