mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-25 07:31:01 +02:00
added support for an alternative ssh port for autotest (needed for running autotest on Vibrant VM)
Review URL: http://codereview.chromium.org/2845002
This commit is contained in:
parent
0635a240d2
commit
61d9768584
@ -10,6 +10,8 @@ ssh_keys/testing_rsa"
|
|||||||
DEFINE_string remote "" "remote hostname/IP of running Chromium OS instance"
|
DEFINE_string remote "" "remote hostname/IP of running Chromium OS instance"
|
||||||
DEFINE_string private_key "$DEFAULT_PRIVATE_KEY" \
|
DEFINE_string private_key "$DEFAULT_PRIVATE_KEY" \
|
||||||
"Private key of root account on remote host"
|
"Private key of root account on remote host"
|
||||||
|
DEFINE_integer ssh_port 22 \
|
||||||
|
"SSH port of the remote machine running Chromium OS instance"
|
||||||
|
|
||||||
# Copies $1 to $2 on remote host
|
# Copies $1 to $2 on remote host
|
||||||
function remote_cp() {
|
function remote_cp() {
|
||||||
@ -19,7 +21,7 @@ function remote_cp() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function remote_sh() {
|
function remote_sh() {
|
||||||
REMOTE_OUT=$(ssh -o StrictHostKeyChecking=no -o \
|
REMOTE_OUT=$(ssh -p ${FLAGS_ssh_port} -o StrictHostKeyChecking=no -o \
|
||||||
UserKnownHostsFile=$TMP_KNOWN_HOSTS root@$FLAGS_remote "$@")
|
UserKnownHostsFile=$TMP_KNOWN_HOSTS root@$FLAGS_remote "$@")
|
||||||
return ${PIPESTATUS[0]}
|
return ${PIPESTATUS[0]}
|
||||||
}
|
}
|
||||||
|
@ -276,6 +276,7 @@ function main() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
${enter_chroot} ${autotest} --board "${FLAGS_board}" -m "${FLAGS_remote}" \
|
${enter_chroot} ${autotest} --board "${FLAGS_board}" -m "${FLAGS_remote}" \
|
||||||
|
--ssh-port ${FLAGS_ssh_port} \
|
||||||
"${option}" "${control_file}" -r "${results_dir}" ${verbose} \
|
"${option}" "${control_file}" -r "${results_dir}" ${verbose} \
|
||||||
"${args[@]}"
|
"${args[@]}"
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user