diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-04-17 14:45:28 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-04-19 06:16:39 +0000 |
| commit | ece482ee63b3a28350648c426c8f862202251891 (patch) | |
| tree | f830877155c3de653385e928ddd5735ff3a8399a /tcwg-buildfarm.yaml | |
| parent | fa76022a6adf42528d85772efb105dff816ca269 (diff) | |
tcwg-buildfarm: Remove workaround for aarch64-linux-gnu 48-bit VA testing
We no longer need it as we are testing on TX1s, which run 42-bit VA.
Change-Id: I9a1d092d4c7a046c392a5bababe597dcd57746ff
Diffstat (limited to 'tcwg-buildfarm.yaml')
| -rw-r--r-- | tcwg-buildfarm.yaml | 53 |
1 files changed, 19 insertions, 34 deletions
diff --git a/tcwg-buildfarm.yaml b/tcwg-buildfarm.yaml index 62c6b0b697..1212d45d03 100644 --- a/tcwg-buildfarm.yaml +++ b/tcwg-buildfarm.yaml @@ -240,43 +240,28 @@ *) echo "ERROR: Wrong target $target"; exit 1 ;; esac - if echo "$override" | grep -q -e "--extraconfigdir ../config/gcc5" \ - || true \ - && [ x"$target" = x"aarch64-linux-gnu" ]; then - # Sanitizers in GCC-5 and GCC-6 toolchains for - # aarch64-linux-gnu don't support 48-bit VA. - # Therefore don't run them on Xenial tester: do - # not start a docker container here, and use abe's - # legacy schroot support on older tester boards - # (tcwg-apm-0[34]) - : - else - - # AArch32 and AArch64 test boards are currently: - # tcwg-tk1-0[34]: AArch32 (armv7) - # tcwg-tx1-0[34]: AArch32 (armv8) and AArch64 - case ${test_container_arch} in - armhf) - tester_labels="tcwg-tk1_32-test" - ;; - armv8hf) - tester_labels="tcwg-tx1_32-test" - test_container_arch=armhf - ;; - arm64) - tester_labels="tcwg-tx1_64-test" - ;; - esac + # AArch32 and AArch64 test boards are currently: + # tcwg-tk1-0[34]: AArch32 (armv7) + # tcwg-tx1-0[34]: AArch32 (armv8) and AArch64 + case ${test_container_arch} in + armhf) + tester_labels="tcwg-tk1_32-test" ;; + armv8hf) + tester_labels="tcwg-tx1_32-test" + test_container_arch=armhf + ;; + arm64) + tester_labels="tcwg-tx1_64-test" + ;; + esac - test_min_load_name=$(node_with_least_containers $tester_labels) - if [ x"$tester_min_load_name" = x"" ]; then - echo "ERROR: Cannot find tester for $test_container_arch" + test_min_load_name=$(node_with_least_containers $tester_labels) + if [ x"$tester_min_load_name" = x"" ]; then + echo "ERROR: Cannot find tester for $test_container_arch" exit 1 - fi - tester=$tester_min_load_name - # For the moment, support only docker containers on the tester machine - bash -x ./jenkins-scripts/start-container-docker.sh --arch ${test_container_arch} --distro trusty --session-host ${tester} --task test > test-container.sh fi + tester=$tester_min_load_name + bash -x ./jenkins-scripts/start-container-docker.sh --arch ${test_container_arch} --distro trusty --session-host ${tester} --task test > test-container.sh ;; esac |