diff options
author | Christophe Lyon <christophe.lyon@linaro.org> | 2018-05-25 12:55:09 +0000 |
---|---|---|
committer | Christophe Lyon <christophe.lyon@linaro.org> | 2018-05-29 19:41:24 +0000 |
commit | 034c872244cb4deac031bdc1f72edf3a87f55dd1 (patch) | |
tree | 827b57d23955eed4488076f6fa2f56c9d949ad2e /tcwg-buildfarm.sh | |
parent | 4617d1401b468de587cb8da5b10e0d60336d93cd (diff) |
tcwg-buildfarm.sh: Support ABE --qemu_cpu option.
Define qemu_cpu and pass it to jenkins.sh, even when testing uses
hardware instead of qemu: in such cases, qemu is not used and this
parameter is ignored/useless.
Define it to make the cpu type we use when testing on hardware:
- cortex-a57 for armv8* (eg TX1 in aarch32 mode)
- cortex-a15 for arm* (eg TK1)
- cortex-a57 for aarch64* (eg TX1 in aarch64 mode)
Change-Id: I51345ddd84835d5383f541fa29b47d6a2f8f35be
Diffstat (limited to 'tcwg-buildfarm.sh')
-rwxr-xr-x | tcwg-buildfarm.sh | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/tcwg-buildfarm.sh b/tcwg-buildfarm.sh index 4d8865ed..bbd2bec0 100755 --- a/tcwg-buildfarm.sh +++ b/tcwg-buildfarm.sh @@ -40,6 +40,17 @@ if echo $runtests | grep -q $target; then fi . ./test-container.sh runtests_opt="$runtests_opt --testcontainer ${test_container_host}:${test_container_port}" + + # Define qemu_cpu even if testing will not use it (it's + # ignored in such cases) + # Choose values matching what we have in testing boards + qemu_cpu="" + case ${target} in + armv8*) qemu_cpu=cortex-a57 ;; + arm*) qemu_cpu=cortex-a15 ;; + aarch64*) qemu_cpu=cortex-a57 ;; + esac + [ "x${qemu_cpu}" != X ] && qemu_cpu="--qemu_cpu ${qemu_cpu}" fi fi @@ -117,7 +128,7 @@ ${build_CONTAINER_RSH} "echo linaro.org | sudo tee /etc/mailname" ${build_CONTAINER_RSH} "sudo postmap hash:/etc/postfix/sasl_password" ${build_CONTAINER_RSH} "sudo /etc/init.d/postfix start" -${build_CONTAINER_RSH} "cd ${WORKSPACE} && bash -x ${WORKSPACE}/jenkins-scripts/jenkins.sh --workspace ${WORKSPACE} --abedir ${WORKSPACE} --override \"$override\" $target_opt --languages ${languages} $bootstrap $runtests_opt $excludecheck_opt ${extraconfig_opt} ${send_results_to} --logserver $log_server $logname_opt $norebuild $options"|| result=$? +${build_CONTAINER_RSH} "cd ${WORKSPACE} && bash -x ${WORKSPACE}/jenkins-scripts/jenkins.sh --workspace ${WORKSPACE} --abedir ${WORKSPACE} --override \"$override ${qemu_cpu}\" $target_opt --languages ${languages} $bootstrap $runtests_opt $excludecheck_opt ${extraconfig_opt} ${send_results_to} --logserver $log_server $logname_opt $norebuild $options"|| result=$? # If the build failed, stop the containers, which will # leave them as-is for ~10 days. |