Increased timeout for waiting for instance up, decreased SSH connection timeout time

Author: davidz627

test/remote/remote/ssh.go

@@ -93,6 +93,11 @@ func SSHNoSudo(host string, cmd ...string) (string, error) {
 	return runSSHCommand("ssh", append([]string{GetHostnameOrIP(host), "--"}, cmd...)...)
 }
 
+// SSHCheckAlive just pings the server quickly to check whether it is reachable by SSH
+func SSHCheckAlive(host string) (string, error) {
+	return runSSHCommand("ssh", []string{GetHostnameOrIP(host), "-o", "ConnectTimeout=10", "--", "echo"}...)
+}
+
 // runSSHCommand executes the ssh or scp command, adding the flag provided --ssh-options
 func runSSHCommand(cmd string, args ...string) (string, error) {
 	if pk, ok := os.LookupEnv("JENKINS_GCE_SSH_PRIVATE_KEY_FILE"); ok {

test/remote/run_remote/run_remote.go

@@ -394,7 +394,7 @@ func createInstance(serviceAccount string) (string, error) {
 	}
 
 	then := time.Now()
-	err = wait.Poll(10*time.Second, 5*time.Minute, func() (bool, error) {
+	err = wait.Poll(15*time.Second, 10*time.Minute, func() (bool, error) {
 		glog.V(2).Infof("Waiting for instance %v to come up. %v elapsed", name, time.Since(then))
 		var instance *compute.Instance
 		instance, err = computeService.Instances.Get(*project, *zone, name).Do()
@@ -413,7 +413,7 @@ func createInstance(serviceAccount string) (string, error) {
 			remote.AddHostnameIP(name, externalIP)
 		}
 
-		if sshOut, err := remote.SSHNoSudo(name, "echo"); err != nil {
+		if sshOut, err := remote.SSHCheckAlive(name); err != nil {
 			err = fmt.Errorf("Instance %v in state RUNNING but not available by SSH: %v", name, err)
 			glog.Warningf("SSH encountered an error: %v, output: %v", err, sshOut)
 			return false, nil