Merge pull request #790 from moreati/docker-diet
tests: Move test container images to Amazon Elastic Container Registry
This commit is contained in:
commit
ee17634c3b
|
@ -17,7 +17,7 @@ batches = [
|
||||||
]
|
]
|
||||||
|
|
||||||
batches.extend(
|
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
|
for distro in ci_lib.DISTROS
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -184,7 +184,11 @@ def get_docker_hostname():
|
||||||
|
|
||||||
|
|
||||||
def image_for_distro(distro):
|
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):
|
def make_containers(name_prefix='', port_offset=0):
|
||||||
|
|
|
@ -86,12 +86,4 @@ if need_to_fix_psycopg2:
|
||||||
|
|
||||||
batches.append(venv_steps)
|
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)
|
ci_lib.run_batches(batches)
|
||||||
|
|
Loading…
Reference in New Issue