qa/distros: configure podman to pull from docker-mirror

This also requires a change to cephadm.py to search for
registry entries for docker.io by 'prefix' or 'location',
and to only add the mirror if a mirror isn't already present

Signed-off-by: Dan Mick <dmick@redhat.com>

diff --git a/qa/distros/all/ubuntu_18.04_podman.yaml b/qa/distros/all/ubuntu_18.04_podman.yaml
index 3d3d99642596c392f716800deba2e196725b733a..214e964ac80a31d6556c8b1faac34ecbd848ef40 100644 (file)
--- a/qa/distros/all/ubuntu_18.04_podman.yaml
+++ b/qa/distros/all/ubuntu_18.04_podman.yaml
@@ -9,4 +9,4 @@ tasks:
     - echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_18.04/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
     - sudo apt update
     - sudo apt -y install podman
-    - echo -e "[registries.search]\nregistries = ['docker.io']" | sudo tee /etc/containers/registries.conf
+    - echo -e "[[registry]]\nlocation = 'docker.io'\n\n[[registry.mirror]]\nlocation='docker-mirror.front.sepia.ceph.com:5000'\n" | sudo tee /etc/containers/registries.conf

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 027b8dc7b3bc82a38c05fc38bdc37da5a82c0b55..0ff2acf925a5c0eda91b810e68d2e4da252d4a0f 100644 (file)
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -1264,13 +1264,17 @@ def registries_add_mirror_to_docker_io(conf, mirror):
         }
     else:
         v2 = config  # type: ignore
-    dockers = [r for r in v2['registry'] if r['prefix'] == 'docker.io']
+    dockers = [
+        r for r in v2['registry'] if
+           r.get('prefix') == 'docker.io' or r.get('location') == 'docker.io'
+    ]
     if dockers:
         docker = dockers[0]
-        docker['mirror'] = [{
-            "location": mirror,
-            "insecure": True,
-        }]
+        if 'mirror' not in docker:
+            docker['mirror'] = [{
+                "location": mirror,
+                "insecure": True,
+            }]
     return v2