diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2019-01-30 08:54:34 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2019-02-07 15:38:06 +0000 |
| commit | 742e147d463a1f9cf95c01077336b36d24187247 (patch) | |
| tree | 21b18581d96d61f9ed854bba168586b0e90d2368 | |
| parent | f85158eefc10f487fad6894c29d21be27fb3d98c (diff) | |
tcwg-benchmark.sh: Ssh directly to the benchmark board.
We [ab]used build_container_exec to ssh the target board to get
most recent ssh configuration. We have since started to require
local ssh access to work as well (e.g., for reboot functionality),
and implemented automatic updates of tcwg-buildslave and
tcwg-benchmark /home files.
Also, don't use ssh multiplexing (-Snone) to reliably forward
ssh agent to the benchmarking board. We have seen strange
ssh-agent failures over shared connections.
Change-Id: Iab09821272aa91f8a80b0e1b8fc5a9dd1a6bd3fb
| -rwxr-xr-x | tcwg-benchmark.sh | 41 |
1 files changed, 16 insertions, 25 deletions
diff --git a/tcwg-benchmark.sh b/tcwg-benchmark.sh index a544a5f0..fbb49111 100755 --- a/tcwg-benchmark.sh +++ b/tcwg-benchmark.sh @@ -71,13 +71,6 @@ case "$toolchain_url" in echo "ERROR: ssh:// toolchain_url lacks a port: $toolchain_url." exit 1 fi - - # Create a helper function, like we have when we create a - # container. - build_container_exec () - { - remote_exec "${build}:$(pwd)" "$@" - } ;; *) # Make sure to cleanup build container if something goes @@ -246,21 +239,19 @@ case "$testmode" in benchmark) input_size="ref" ;; esac -build_container_exec ssh -t "$boardname" bmk-scripts/run.sh \ - --bench "$(printf '%q' "$bench_list")" \ - --config "${BUILD_NUMBER}-$run_profile" \ - --cflags "$(printf '%q' "$cflags")" \ - --ccprefix "$ccprefix" \ - --extension "$extension" \ - --ignore_errors "$ignore_errors" \ - --input_size "$input_size" \ - --iterations "$iterations" \ - --run_profile "$run_profile" \ - "${sysroot:+--sysroot "$sysroot"}" \ - --toolchain "$toolchain_type" \ - --resultsdest "dev-01.tcwglab:/home/tcwg-benchmark/results-${results_id}/${NODE_NAME}" \ - --nodename "${NODE_NAME}" \ - --forceinstall "${forceinstall}" \ - --verbose true - -exit 0 +ssh -t -Snone "$boardname" bmk-scripts/run.sh \ + --bench "$(printf '%q' "$bench_list")" \ + --config "${BUILD_NUMBER}-$run_profile" \ + --cflags "$(printf '%q' "$cflags")" \ + --ccprefix "$ccprefix" \ + --extension "$extension" \ + --ignore_errors "$ignore_errors" \ + --input_size "$input_size" \ + --iterations "$iterations" \ + --run_profile "$run_profile" \ + "${sysroot:+--sysroot "$sysroot"}" \ + --toolchain "$toolchain_type" \ + --resultsdest "dev-01.tcwglab:/home/tcwg-benchmark/results-${results_id}/${NODE_NAME}" \ + --nodename "${NODE_NAME}" \ + --forceinstall "${forceinstall}" \ + --verbose true |