diff --git a/hack/e2e.sh b/hack/e2e.sh index afedc9dd4e..738092da91 100755 --- a/hack/e2e.sh +++ b/hack/e2e.sh @@ -147,6 +147,16 @@ VSPHERE_SSH_AUTHORIZED_KEY="$(cat "${VSPHERE_SSH_PRIVATE_KEY}.pub")" # Ensure vSphere is reachable function wait_for_vsphere_reachable() { + echo "# installing tcptraceroute to check route" + { + apt-get update && apt-get install -y tcptraceroute + } > /dev/null + + echo "$ ip link" + ip link + echo "$ tcptraceroute ${VSPHERE_SERVER} 443" + tcptraceroute "${VSPHERE_SERVER}" 443 + local n=0 until [ $n -ge 300 ]; do curl -s -v "https://${VSPHERE_SERVER}/sdk" --connect-timeout 2 -k && RET=$? || RET=$? @@ -157,15 +167,10 @@ function wait_for_vsphere_reachable() { echo "Failed to reach https://${VSPHERE_SERVER}/sdk. Retrying in 1s ($n/300)" sleep 1 done - if [ "$RET" -ne 0 ]; then - # Output some debug information in case of failing connectivity. - echo "$ ip link" - ip link - echo "# installing tcptraceroute to check route" - apt-get update && apt-get install -y tcptraceroute - echo "$ tcptraceroute ${VSPHERE_SERVER} 443" - tcptraceroute "${VSPHERE_SERVER}" 443 - fi + + echo "$ tcptraceroute ${VSPHERE_SERVER} 443" + tcptraceroute "${VSPHERE_SERVER}" 443 + return "$RET" } # Only run the boskos/check for IPAM when we need them (not for vcsim)