diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-08-31 14:05:48 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-08-31 14:05:48 +0000 |
| commit | 7626fe1c82396dea3a26220009f009218f2e56b6 (patch) | |
| tree | 8cfc80ce1ca1defc3e4581ff7b2be80e04631f7b | |
| parent | 26d59817ff30c8183906682a36aee047ca94036f (diff) | |
start-container-docker.sh: Remove workaround for armhf
We now have armhf focal image
Change-Id: I32800d687eb1d88c86ce3be1423b7c5c9751d577
| -rwxr-xr-x | start-container-docker.sh | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/start-container-docker.sh b/start-container-docker.sh index a1e30b51..208ff8f2 100755 --- a/start-container-docker.sh +++ b/start-container-docker.sh @@ -210,14 +210,9 @@ if [ x"$session_name" = x ]; then fi # Resolve LTS and LTS-1 values to Ubuntu distros. -case "$distro:$container_arch" in - lts_1:*|default:*) distro=bionic ;; - lts:armhf) - # There's still no arm32v7/ubuntu:focal docker image, so - # force using bionic for armhf for now. - distro=bionic - ;; - lts:*) distro=focal ;; +case "$distro" in + lts_1|default) distro=bionic ;; + lts) distro=focal ;; esac image=linaro/ci-${container_arch}-tcwg-build-ubuntu:${distro} |