Merge "Use opendev container mirror base job"

zuul.d/docker-mirror.yaml

@@ -27,8 +27,8 @@
             veduZ2ez41v020BeUuAp27UjoYfCYIR06e/b1Wzalb04quf0dJpqE5JEUcS/uo=
 
 - job:
-    name: old-opendev-mirror-container-images
-    parent: mirror-container-images
+    name: system-config-mirror-container-images
+    parent: opendev-mirror-container-images
     description: |
       Mirror container images from dockerhub to quay.io
     secrets:
@@ -37,112 +37,155 @@
       pass-to-parent: true
     abstract: true
     vars:
-      docker_mirror_base_url: "https://{{ zuul_site_mirror_fqdn }}/deb-docker/{{ ansible_distribution_release }}"
-      zuul_work_dir: "{{ zuul.projects['opendev.org/opendev/system-config'].src_dir }}"
       container_command: docker
 
 - job:
     name: opendev-mirror-container-image-gerrit
-    parent: old-opendev-mirror-container-images
+    parent: system-config-mirror-container-images
     vars:
-        mirror_container_images_images:
-          - src_repository: docker.io/gerritcodereview/gerrit
-            src_tag: latest
-            dest_repository: quay.io/opendevmirror/gerrit
-            dest_tag: latest
-            dest_registry: quay.io
+      container_images:
+        - registry: quay.io
+          namespace: opendevmirror
+          repo_shortname: gerrit
+          repo_description: Gerrit mirror
+      mirror_container_images_images:
+        - src_repository: docker.io/gerritcodereview/gerrit
+          src_tag: latest
+          dest_repository: quay.io/opendevmirror/gerrit
+          dest_tag: latest
+          dest_registry: quay.io
 
 - job:
     name: opendev-mirror-container-image-golang
-    parent: old-opendev-mirror-container-images
+    parent: system-config-mirror-container-images
     vars:
-        mirror_container_images_images:
-          - src_repository: docker.io/library/golang
-            src_tag: 1.22-bookworm
-            dest_repository: quay.io/opendevmirror/golang
-            dest_tag: 1.22-bookworm
-            dest_registry: quay.io
+      container_images:
+        - registry: quay.io
+          namespace: opendevmirror
+          repo_shortname: golang
+          repo_description: Golang mirror
+      mirror_container_images_images:
+        - src_repository: docker.io/library/golang
+          src_tag: 1.22-bookworm
+          dest_repository: quay.io/opendevmirror/golang
+          dest_tag: 1.22-bookworm
+          dest_registry: quay.io
 
 - job:
     name: opendev-mirror-container-image-httpd
-    parent: old-opendev-mirror-container-images
+    parent: system-config-mirror-container-images
     vars:
-        mirror_container_images_images:
-          - src_repository: docker.io/library/httpd
-            src_tag: alpine
-            dest_repository: quay.io/opendevmirror/httpd
-            dest_tag: alpine
-            dest_registry: quay.io
+      container_images:
+        - registry: quay.io
+          namespace: opendevmirror
+          repo_shortname: httpd
+          repo_description: Httpd mirror
+      mirror_container_images_images:
+        - src_repository: docker.io/library/httpd
+          src_tag: alpine
+          dest_repository: quay.io/opendevmirror/httpd
+          dest_tag: alpine
+          dest_registry: quay.io
 
 - job:
     name: opendev-mirror-container-image-mariadb
-    parent: old-opendev-mirror-container-images
+    parent: system-config-mirror-container-images
     vars:
-        mirror_container_images_images:
-          - src_repository: docker.io/library/mariadb
-            src_tag: latest
-            dest_repository: quay.io/opendevmirror/mariadb
-            dest_tag: latest
-            dest_registry: quay.io
+      container_images:
+        - registry: quay.io
+          namespace: opendevmirror
+          repo_shortname: mariadb
+          repo_description: MariaDB mirror
+      mirror_container_images_images:
+        - src_repository: docker.io/library/mariadb
+          src_tag: latest
+          dest_repository: quay.io/opendevmirror/mariadb
+          dest_tag: latest
+          dest_registry: quay.io
 
 - job:
     name: opendev-mirror-container-image-node
-    parent: old-opendev-mirror-container-images
+    parent: system-config-mirror-container-images
     vars:
-        mirror_container_images_images:
-          - src_repository: docker.io/library/node
-            src_tag: 16-bookworm
-            dest_repository: quay.io/opendevmirror/node
-            dest_tag: 16-bookworm
-            dest_registry: quay.io
+      container_images:
+        - registry: quay.io
+          namespace: opendevmirror
+          repo_shortname: node
+          repo_description: Node mirror
+      mirror_container_images_images:
+        - src_repository: docker.io/library/node
+          src_tag: 16-bookworm
+          dest_repository: quay.io/opendevmirror/node
+          dest_tag: 16-bookworm
+          dest_registry: quay.io
 
 # TODO: move the canonical location of this image to quay
 - job:
     name: opendev-mirror-container-image-python-base
-    parent: old-opendev-mirror-container-images
+    parent: system-config-mirror-container-images
     vars:
-        mirror_container_images_images:
-          - src_repository: docker.io/opendevorg/python-base
-            src_tag: 3.11-bookworm
-            dest_repository: quay.io/opendevmirror/python-base
-            dest_tag: 3.11-bookworm
-            dest_registry: quay.io
-          - src_repository: docker.io/opendevorg/python-base
-            src_tag: 3.11-bookworm-debug
-            dest_repository: quay.io/opendevmirror/python-base
-            dest_tag: 3.11-bookworm-debug
-            dest_registry: quay.io
+      container_images:
+        - registry: quay.io
+          namespace: opendevmirror
+          repo_shortname: python-base
+          repo_description: Python-base mirror
+      mirror_container_images_images:
+        - src_repository: docker.io/opendevorg/python-base
+          src_tag: 3.11-bookworm
+          dest_repository: quay.io/opendevmirror/python-base
+          dest_tag: 3.11-bookworm
+          dest_registry: quay.io
+        - src_repository: docker.io/opendevorg/python-base
+          src_tag: 3.11-bookworm-debug
+          dest_repository: quay.io/opendevmirror/python-base
+          dest_tag: 3.11-bookworm-debug
+          dest_registry: quay.io
 
 # TODO: move the canonical location of this image to quay
 - job:
     name: opendev-mirror-container-image-python-builder
-    parent: old-opendev-mirror-container-images
+    parent: system-config-mirror-container-images
     vars:
-        mirror_container_images_images:
-          - src_repository: docker.io/opendevorg/python-builder
-            src_tag: 3.11-bookworm
-            dest_repository: quay.io/opendevmirror/python-builder
-            dest_tag: 3.11-bookworm
-            dest_registry: quay.io
+      container_images:
+        - registry: quay.io
+          namespace: opendevmirror
+          repo_shortname: python-builder
+          repo_description: Python-builder mirror
+      mirror_container_images_images:
+        - src_repository: docker.io/opendevorg/python-builder
+          src_tag: 3.11-bookworm
+          dest_repository: quay.io/opendevmirror/python-builder
+          dest_tag: 3.11-bookworm
+          dest_registry: quay.io
 
 - job:
     name: opendev-mirror-container-image-ubuntu
-    parent: old-opendev-mirror-container-images
+    parent: system-config-mirror-container-images
     vars:
-        mirror_container_images_images:
-          - src_repository: docker.io/library/ubuntu
-            src_tag: 22.04
-            dest_repository: quay.io/opendevmirror/ubuntu
-            dest_tag: 22.04
-            dest_registry: quay.io
+      container_images:
+        - registry: quay.io
+          namespace: opendevmirror
+          repo_shortname: ubuntu
+          repo_description: Ubuntu mirror
+      mirror_container_images_images:
+        - src_repository: docker.io/library/ubuntu
+          src_tag: 22.04
+          dest_repository: quay.io/opendevmirror/ubuntu
+          dest_tag: 22.04
+          dest_registry: quay.io
 
 - job:
     name: opendev-mirror-container-image-zookeeper
-    parent: old-opendev-mirror-container-images
+    parent: system-config-mirror-container-images
     vars:
-        mirror_container_images_images:
-          - src_repository: docker.io/library/zookeeper
-            src_tag: latest
-            dest_repository: quay.io/opendevmirror/zookeeper
-            dest_tag: latest
-            dest_registry: quay.io
+      container_images:
+        - registry: quay.io
+          namespace: opendevmirror
+          repo_shortname: zookeeper
+          repo_description: ZooKeeper mirror
+      mirror_container_images_images:
+        - src_repository: docker.io/library/zookeeper
+          src_tag: latest
+          dest_repository: quay.io/opendevmirror/zookeeper
+          dest_tag: latest
+          dest_registry: quay.io