diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-06-19 07:49:41 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-06-19 07:49:41 +0000 |
| commit | 3a8c432e436c6a8ab7d4681f0a105afd84145118 (patch) | |
| tree | 4e63ace8533b79147da1458e7ef9568506af7b7f /tcwg-benchmark.sh | |
| parent | 7797e7f572ac89f7aab037398f3a2be7cdb300a2 (diff) | |
tcwg-benchmark.sh: Stop using $NODE_NAME
... use $boardname instead.
Change-Id: Iddb92273402d03267e45edf16577ca66b447b10d
Diffstat (limited to 'tcwg-benchmark.sh')
| -rwxr-xr-x | tcwg-benchmark.sh | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/tcwg-benchmark.sh b/tcwg-benchmark.sh index 81259204..2ded4a8f 100755 --- a/tcwg-benchmark.sh +++ b/tcwg-benchmark.sh @@ -8,6 +8,7 @@ scripts=$(dirname "$0") # Make shellcheck happy and workaround Jenkins not defining variables # for empty arguments. bench_container_tag="${bench_container_tag-bionic}" +boardname="$boardname" build_container_tag="${build_container_tag-bionic}" image_arch="$image_arch" toolchain_url="$toolchain_url" @@ -25,7 +26,6 @@ forceinstall="$forceinstall" builder="$builder" results_id="$results_id" BUILD_NUMBER="$BUILD_NUMBER" -NODE_NAME="$NODE_NAME" WORKSPACE="$WORKSPACE" reboot="$reboot" prepare_board="${prepare_board-true}" @@ -211,10 +211,6 @@ case "$sysroot" in ;; esac -# Slaves for this job are virtual slaves on dev-01, -# convert the slave name into the target board name -boardname="${NODE_NAME}" - if echo "$results_id" | grep -q "\.\."; then echo "ERROR: results_id should not escape /home/tcwg-benchmark/results* hierarchy; do not use \"..\"" exit 1 @@ -333,8 +329,8 @@ remote_exec "$run_container_host:$run_container_port::-t -Snone" \ --run_profile "$run_profile" \ ${sysroot:+--sysroot "$sysroot"} \ --toolchain "$toolchain_type" \ - --resultsdest "bkp-01.tcwglab:/home/tcwg-benchmark/results-${results_id}/${NODE_NAME}" \ - --nodename "${NODE_NAME}" \ + --resultsdest "bkp-01.tcwglab:/home/tcwg-benchmark/results-${results_id}/$boardname" \ + --nodename "$boardname" \ --forceinstall "${forceinstall}" \ ${clean_older_than:+--clean_older_than "$clean_older_than"} \ --verbose true |