Merge pull request #433 from matthew-brett/focal-images-for-64-bit

Change default test image for 64-bit

README.rst

@@ -270,8 +270,8 @@ Test phase
 Specify the version to test with the ``DOCKER_TEST_IMAGE`` environment
 variable. The default version is dependent on ``PLAT``:
 
-* ``matthewbrett/trusty:64``, for ``x86_64``
-* ``matthewbrett/trusty:32`` for ``i686``
+* ``multibuild/focal_x86_64``, for ``x86_64``
+* ``matthewbrett/trusty:32`` for ``i686`` (Yes, an older image for 32-bit)
 * ``multibuild/xenial_arm64v8`` for ``aarch64``
 * ``multibuild/xenial_ppc64le`` for ``ppc64le``
 * ``mutlibuild/xenial_s390x`` for ``s390x``

travis_linux_steps.sh

@@ -120,10 +120,14 @@ function install_run {
     local plat=${1:-${PLAT:-x86_64}}
     if [ -z "$DOCKER_TEST_IMAGE" ]; then
         if [ "$MB_ML_LIBC" == "musllinux" ]; then
-          local docker_image="multibuild/alpine3.14_$plat"
+            local docker_image="multibuild/alpine3.14_$plat"
         else
-          local bitness=$([ "$plat" == i686 ] && echo 32 || echo 64)
-          local docker_image="matthewbrett/trusty:$bitness"
+            local bitness=$([ "$plat" == i686 ] && echo 32 || echo 64)
+            if [ "$bitness" == "32" ]; then
+                local docker_image="matthewbrett/trusty:$bitness"
+            else
+                local docker_image="multibuild/focal_x86_64"
+            fi
         fi
     else
         # aarch64 is called arm64v8 in Ubuntu