start-container-docker.sh: Workaround missing arm32v7/ubuntu:focal image

Change-Id: Ic926732228ed76541632bd02acd6cf0674d28f6c

1 files changed, 8 insertions, 3 deletions

diff --git a/start-container-docker.sh b/start-container-docker.sh
index 61cc9933..f7a7f45f 100755
--- a/start-container-docker.sh
+++ b/start-container-docker.sh
@@ -210,9 +210,14 @@ if [ x"$session_name" = x ]; then
 fi
 
 # Resolve LTS and LTS-1 values to Ubuntu distros.
-case "$distro" in
-    lts_1|default) distro=bionic ;;
-    lts) distro=focal ;;
+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 ;;
 esac
 
 image=linaro/ci-${container_arch}-tcwg-build-ubuntu:${distro}