diff options
| author | Laurent Alfonsi <laurent.alfonsi@linaro.org> | 2023-06-23 07:23:28 +0000 |
|---|---|---|
| committer | Laurent Alfonsi <laurent.alfonsi@linaro.org> | 2023-06-23 07:23:46 +0000 |
| commit | 966d4bc6724c2adb59d376e32c9008000eefa5b8 (patch) | |
| tree | ec44e99da84a0bbad6edb37ca552b10d6ffcc649 /tcwg-benchmark.sh | |
| parent | 34aa41215869b4eb5ed21b1208af9972db958253 (diff) | |
Revert "tcwg-benchmark.sh: Add results_dest parameter to specify the dir to move the results"
This reverts commit 599ad553427ff256558f207e3cc4d9a9a0ca939d.
Reason for revert: pb with ci job deployment make it bancal
Change-Id: Ie6503beda3d754253fa453940b4d0b307edfd7ce
Diffstat (limited to 'tcwg-benchmark.sh')
| -rwxr-xr-x | tcwg-benchmark.sh | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/tcwg-benchmark.sh b/tcwg-benchmark.sh index 6eddc91d..531412eb 100755 --- a/tcwg-benchmark.sh +++ b/tcwg-benchmark.sh @@ -23,12 +23,11 @@ obligatory_variables \ sysroot \ forceinstall \ builder \ - results_dest \ + results_id \ WORKSPACE \ reboot \ ignore_errors \ - clean_older_than \ - hw_tag + clean_older_than declare -g \ boardname \ image_arch \ @@ -43,12 +42,11 @@ declare -g \ sysroot \ forceinstall \ builder \ - results_dest \ + results_id \ WORKSPACE \ reboot \ ignore_errors \ - clean_older_than \ - hw_tag + clean_older_than # Make shellcheck happy and workaround Jenkins not defining variables # for empty arguments. @@ -261,6 +259,12 @@ 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) ;; @@ -275,7 +279,7 @@ case "$hw_tag:$boardname:$image_arch" in qc_32:*-qc-*:armhf) ;; qc_64:*-qc-*:arm64) ;; *) - echo "ERROR: hw_tag parameter is not valid : $hw_tag" + echo "ERROR: results_id does not start with a valid hw_tag: $hw_tag" exit 1 ;; esac @@ -434,7 +438,7 @@ case "$bench_list" in --cflags "$cflags" \ --ldflags "$ldflags" \ --forceinstall "true" \ - --resultsdest "${results_dest}/$boardname" \ + --resultsdest "bkp-01.tcwglab:/home/tcwg-benchmark/results-${results_id}/$boardname" \ --verbose true ;; *) # any others keywords corresponds to spec2xxx (either 2006 or 2017) @@ -466,7 +470,7 @@ case "$bench_list" in ${sysroot:+--sysroot "$sysroot"} \ --toolchain "$toolchain_type" \ $support_fortran_opt \ - --resultsdest "${results_dest}/$boardname" \ + --resultsdest "bkp-01.tcwglab:/home/tcwg-benchmark/results-${results_id}/$boardname" \ --nodename "$boardname" \ --forceinstall "${forceinstall}" \ ${clean_older_than:+--clean_older_than "$clean_older_than"} \ |