diff options
| author | zhizhouy <zhizhouy@google.com> | 2020-05-27 20:46:27 -0700 |
|---|---|---|
| committer | Zhizhou Yang <zhizhouy@google.com> | 2020-05-28 03:58:40 +0000 |
| commit | c5bfbeeb8f3b84258129e5fe423fe47bbb0db4b5 (patch) | |
| tree | e53fe758cada74ba744ddb5c415a4cf6b462f14b /cros_utils/command_executer.py | |
| parent | aa3acaecad43e4e497f70a0504bf70b733581d6e (diff) | |
| download | toolchain-utils-c5bfbeeb8f3b84258129e5fe423fe47bbb0db4b5.tar.gz | |
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>
Diffstat (limited to 'cros_utils/command_executer.py')
| -rwxr-xr-x | cros_utils/command_executer.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cros_utils/command_executer.py b/cros_utils/command_executer.py index 002aa754..b9acbe31 100755 --- a/cros_utils/command_executer.py +++ b/cros_utils/command_executer.py @@ -480,8 +480,8 @@ class CommandExecuter(object): 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) |