diff --git a/.ci/ansible_install.py b/.ci/ansible_install.py index 906961db..bb659f8a 100755 --- a/.ci/ansible_install.py +++ b/.ci/ansible_install.py @@ -17,7 +17,7 @@ batches = [ ] batches.extend( - ['docker pull %s' % (ci_lib.image_for_distro(distro),)] + ['docker pull %s' % (ci_lib.image_for_distro(distro),), 'sleep 1'] for distro in ci_lib.DISTROS ) diff --git a/.ci/ci_lib.py b/.ci/ci_lib.py index f735f6a1..285d7f19 100644 --- a/.ci/ci_lib.py +++ b/.ci/ci_lib.py @@ -184,7 +184,11 @@ def get_docker_hostname(): def image_for_distro(distro): - return 'mitogen/%s-test' % (distro.partition('-')[0],) + """Return the container image name or path for a test distro name. + + The returned value is suitable for use with `docker pull`. + """ + return 'public.ecr.aws/n5z0e8q9/%s-test' % (distro.partition('-')[0],) def make_containers(name_prefix='', port_offset=0): diff --git a/.ci/prep_azure.py b/.ci/prep_azure.py index e236e3e7..80dbf485 100755 --- a/.ci/prep_azure.py +++ b/.ci/prep_azure.py @@ -86,12 +86,4 @@ if need_to_fix_psycopg2: batches.append(venv_steps) - -if ci_lib.have_docker(): - batches.extend( - ['docker pull %s' % (ci_lib.image_for_distro(distro),)] - for distro in ci_lib.DISTROS - ) - - ci_lib.run_batches(batches)