Switch distro test containers to quay.io images.

test/runner/lib/config.py

@@ -40,6 +40,7 @@ class EnvironmentConfig(CommonConfig):
             self.python = args.tox  # type: str
 
         self.docker = docker_qualify_image(args.docker)  # type: str
+        self.docker_raw = args.docker  # type: str
         self.remote = args.remote  # type: str
 
         self.docker_privileged = args.docker_privileged if 'docker_privileged' in args else False  # type: bool

test/runner/lib/delegation.py

@@ -197,7 +197,7 @@ def delegate_docker(args, exclude, require, integration_targets):
 
     if isinstance(args, TestConfig):
         if args.coverage and not args.coverage_label:
-            image_label = re.sub('^ansible/ansible:', '', args.docker)
+            image_label = args.docker_raw
             image_label = re.sub('[^a-zA-Z0-9]+', '-', image_label)
             cmd += ['--coverage-label', 'docker-%s' % image_label]
 

test/runner/lib/util.py

@@ -45,11 +45,27 @@ def get_docker_completion():
         with open('test/runner/completion/docker.txt', 'r') as completion_fd:
             images = completion_fd.read().splitlines()
 
-        DOCKER_COMPLETION.update(dict((i.split('@')[0], i) for i in images))
+        DOCKER_COMPLETION.update(dict(kvp for kvp in [parse_docker_completion(i) for i in images] if kvp))
 
     return DOCKER_COMPLETION
 
 
+def parse_docker_completion(value):
+    """
+    :type value: str
+    :rtype: tuple[str, dict[str, str]]
+    """
+    values = value.split()
+
+    if not values:
+        return None
+
+    name = values[0]
+    data = dict((kvp[0], kvp[1] if len(kvp) > 1 else '') for kvp in [item.split('=', 1) for item in values[1:]])
+
+    return name, data
+
+
 def is_shippable():
     """
     :rtype: bool
@@ -704,12 +720,9 @@ def docker_qualify_image(name):
     :type name: str
     :rtype: str
     """
-    if not name or any((c in name) for c in ('/', ':')):
-        return name
+    config = get_docker_completion().get(name, {})
 
-    name = get_docker_completion().get(name, name)
-
-    return 'ansible/ansible:%s' % name
+    return config.get('name', name)
 
 
 def parse_to_dict(pattern, value):