commit c5bfbeeb8f3b84258129e5fe423fe47bbb0db4b5
author zhizhouy <zhizhouy@google.com> Wed May 27 20:46:27 2020 -0700
committer Zhizhou Yang <zhizhouy@google.com> Thu May 28 03:58:40 2020 +0000
tree e53fe758cada74ba744ddb5c415a4cf6b462f14b
parent aa3acaecad43e4e497f70a0504bf70b733581d6e

crosperf: do not pass -p for ssh by default

The default value of FLAGS_ssh_port has been changed in an earlier
CL:2202616, causing crosperf failures when running ssh.

According to CL:2209173, the system will help decide the port to use for
ssh, so we don't need to specify it explicitly in our command.

BUG=None
TEST=tested with lab machines with crosperf

Change-Id: Ie40dc1a21452b01cb0643e191110f03e009b7c73
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2218540
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Commit-Queue: Zhizhou Yang <zhizhouy@google.com>
Tested-by: Zhizhou Yang <zhizhouy@google.com>

cros_utils/command_executer.py

diff --git a/cros_utils/command_executer.py b/cros_utils/command_executer.py
index 002aa75..b9acbe3 100755
--- a/cros_utils/command_executer.py
+++ b/cros_utils/command_executer.py
@@ -480,8 +480,8 @@
 
       command = self.RemoteAccessInitCommand(chromeos_root, cros_machine)
       ssh_command = (
-          'ssh -p ${FLAGS_ssh_port}' + ' -o StrictHostKeyChecking=no' +
-          ' -o UserKnownHostsFile=$(mktemp)' + ' -i $TMP_PRIVATE_KEY')
+          'ssh -o StrictHostKeyChecking=no' + ' -o UserKnownHostsFile=$(mktemp)'
+          + ' -i $TMP_PRIVATE_KEY')
       rsync_prefix = '\nrsync -r -e "%s" ' % ssh_command
       if dest_cros:
         command += rsync_prefix + '%s root@%s:%s' % (src, dest_machine, dest)