diff options
author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-06-17 14:31:07 +0000 |
---|---|---|
committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-06-17 14:31:26 +0000 |
commit | abd07fb890cfc95143aacc00c4a1861e0f925852 (patch) | |
tree | 37f2367087427547f0e91a4dbcf705985b300eb0 /tcwg_bmk-build.sh | |
parent | 2b2404cff4f6cbe19248916e280a1a58ab50de6d (diff) |
Revert "tcwg_bmk-build.sh: Switch TK1 and TX1 benchmarking to new bmk job"
This reverts commit 4147f30f9230cb4a2daf3b21a2ce7d4102e8f3da.
Reason for revert: New jobs now have same names and previous old jobs
Change-Id: I26d247e264112fecdc4f599e108834bd8e609e5b
Diffstat (limited to 'tcwg_bmk-build.sh')
-rwxr-xr-x | tcwg_bmk-build.sh | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/tcwg_bmk-build.sh b/tcwg_bmk-build.sh index 079b623c..5ad9e951 100755 --- a/tcwg_bmk-build.sh +++ b/tcwg_bmk-build.sh @@ -259,13 +259,9 @@ benchmark () sysroot="ssh://$ssh_host:$ssh_port:$sysroot" local hw results_top image_arch results_id - local bmk_job=tcwg-benchmark case "${rr[target]}" in armv8*) hw=tx1; results_top=tx1_32; image_arch=armhf ;; - arm_eabi) - hw=stm32; results_top=stm32_STM32L476RGTx; image_arch=armhf - bmk_job=tcwg-benchmark-stm32 - ;; + arm_eabi) hw=stm32; results_top=stm32_STM32L476RGTx; image_arch=armhf ;; arm*) hw=tk1; results_top=tk1_32; image_arch=armhf ;; aarch64*) hw=tx1; results_top=tx1_64; image_arch=arm64 ;; *) echo "ERROR: Unknown target ${rr[target]}"; exit 1 ;; @@ -281,13 +277,12 @@ benchmark () # shellcheck disable=SC2154 remote_exec "ci.linaro.org:2222::-l $USER@linaro.org" \ - build $bmk_job -w \ - -p bmk_hw=$hw \ + build tcwg-benchmark-$hw -w \ -p bench_list="$bench_list" \ -p cflags="$bmk_flags" \ -p ldflags="$bmk_ldflags" \ -p testmode=benchmark \ - -p displaytag="#\$BUILD_NUMBER-${rr[ci_project]}/${rr[mode]}-${rr[ci_config]}" \ + -p displaytag="${rr[ci_project]}/${rr[mode]}-${rr[ci_config]}" \ -p ignore_errors=true \ -p toolchain_url=$toolchain_proto://$ssh_host:$ssh_port:$cc \ -p toolchain_type=$toolchain \ @@ -310,7 +305,7 @@ benchmark () local build_ret while true; do (remote_exec "ci.linaro.org:2222::-l $USER@linaro.org" \ - console $bmk_job -n 1 -f $build_num || true) \ + console tcwg-benchmark-$hw -n 1 -f $build_num || true) \ | tee -a $run_step_artifacts/benchmark.log # Ssh connection to ci.linaro.org occasionally drops. We need |