issue #426: teach .ci/ Docker pulls to ignore -py3 image suffix.

.ci/ansible_install.py

@@ -14,7 +14,7 @@ batches = [
 ]
 
 batches.extend(
-    ['docker pull mitogen/%s-test' % (distro,)]
+    ['docker pull %s' % (ci_lib.image_for_distro(distro),)]
     for distro in ci_lib.DISTROS
 )
 

.ci/ci_lib.py

@@ -142,6 +142,10 @@ def get_docker_hostname():
     return parsed.netloc.partition(':')[0]
 
 
+def image_for_distro(distro):
+    return 'mitogen/%s-test' % (distro.partition('-')[0],)
+
+
 def make_containers():
     docker_hostname = get_docker_hostname()
     return [

.ci/debops_common_install.py

@@ -13,6 +13,6 @@ ci_lib.run_batches([
         'pip install -qqqU debops==0.7.2 ansible==%s' % ci_lib.ANSIBLE_VERSION,
     ],
     [
-        'docker pull mitogen/debian-test',
+        'docker pull %s' % (ci_lib.image_for_distro('debian'),),
     ],
 ])

.ci/mitogen_install.py

@@ -8,7 +8,7 @@ batches = [
         'pip install -r tests/requirements.txt',
     ],
     [
-        'docker pull mitogen/%s-test' % (ci_lib.DISTRO,),
+        'docker pull %s' % (ci_lib.image_for_distro(ci_lib.DISTRO),),
     ]
 ]
 

.ci/prep_azure.py

@@ -15,7 +15,7 @@ batches.append([
 ])
 
 batches.extend(
-    ['docker pull mitogen/%s-test' % (distro,)]
+    ['docker pull %s' % (ci_lib.image_for_distro(distro),)]
     for distro in ci_lib.DISTROS
 )