diff options
| -rwxr-xr-x | tcwg-benchmark.sh | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/tcwg-benchmark.sh b/tcwg-benchmark.sh index 531412eb..6eddc91d 100755 --- a/tcwg-benchmark.sh +++ b/tcwg-benchmark.sh @@ -23,11 +23,12 @@ obligatory_variables \ sysroot \ forceinstall \ builder \ - results_id \ + results_dest \ WORKSPACE \ reboot \ ignore_errors \ - clean_older_than + clean_older_than \ + hw_tag declare -g \ boardname \ image_arch \ @@ -42,11 +43,12 @@ declare -g \ sysroot \ forceinstall \ builder \ - results_id \ + results_dest \ WORKSPACE \ reboot \ ignore_errors \ - clean_older_than + clean_older_than \ + hw_tag # Make shellcheck happy and workaround Jenkins not defining variables # for empty arguments. @@ -259,12 +261,6 @@ case "$sysroot" in esac } -if echo "$results_id" | grep "\.\." >/dev/null; then - echo "ERROR: results_id should not escape /home/tcwg-benchmark/results* hierarchy; do not use \"..\"" - exit 1 -fi - -hw_tag="${results_id%%/*}" case "$hw_tag:$boardname:$image_arch" in apm_32:*-apm-*:armhf) ;; apm_64:*-apm-*:arm64) ;; @@ -279,7 +275,7 @@ case "$hw_tag:$boardname:$image_arch" in qc_32:*-qc-*:armhf) ;; qc_64:*-qc-*:arm64) ;; *) - echo "ERROR: results_id does not start with a valid hw_tag: $hw_tag" + echo "ERROR: hw_tag parameter is not valid : $hw_tag" exit 1 ;; esac @@ -438,7 +434,7 @@ case "$bench_list" in --cflags "$cflags" \ --ldflags "$ldflags" \ --forceinstall "true" \ - --resultsdest "bkp-01.tcwglab:/home/tcwg-benchmark/results-${results_id}/$boardname" \ + --resultsdest "${results_dest}/$boardname" \ --verbose true ;; *) # any others keywords corresponds to spec2xxx (either 2006 or 2017) @@ -470,7 +466,7 @@ case "$bench_list" in ${sysroot:+--sysroot "$sysroot"} \ --toolchain "$toolchain_type" \ $support_fortran_opt \ - --resultsdest "bkp-01.tcwglab:/home/tcwg-benchmark/results-${results_id}/$boardname" \ + --resultsdest "${results_dest}/$boardname" \ --nodename "$boardname" \ --forceinstall "${forceinstall}" \ ${clean_older_than:+--clean_older_than "$clean_older_than"} \ |