Publish container images to quay.io

Change-Id: If4b7596efd873acb8f06fddf016d9aff689b85ca

.zuul.yaml

@@ -1,24 +1,36 @@
 # Image building jobs
 - secret:
-    name: zuul-registry-dockerhub
+    name: zuul-registry-registry-credentials
     data:
-      username: zuulzuul
+      quay.io:
-      password: !encrypted/pkcs1-oaep
+        username: zuul-ci+opendevzuul
-        - mc+bK6/dQJ/gzrR5jFYEm9eepVfWG0xiTxxPCunDN0tgbis+xbe1cBOAEdZmjkNrXO/0V
+        password: !encrypted/pkcs1-oaep
-          6d7EcH0JP8mD9jgaTMVWKhVHUF4m/pikP5S4oKgfQYf9PKtzaSp298fhu+4RzuKR01ywj
+          - U8grF8lgA4UYRsuELWGXo5WtqRrhDbq5JbFds743nNaRgih/INwociBXwpF1mNxiQLOv3
-          ks8MWj2oZKJeikQVVbK6z8wMQYirxmaUvivKOU6eJmiPMYs3AaC+P6oc1vEGHMFaa+QpG
+            PIh/QzSaGEe1sYpNL2awT9G6BL1X2ViqtlQn7aW1EoNjtjg1ZnXHwMlFk1ByU4UWG+m7K
-          3hD2z+y7Ix/YFKyDQPk4DOs1lTveE18RCBIiP4IRXuYxKkR5uSqj4KEmdcdxBZ6mQyTbw
+            pNmV9JcthnHPafAEb+423mrJKM1N1/XG+y6EMujsEnXaHq4oxCbegWJJa6cv7heAWSbuf
-          uZwLMPlkFTNYkaKetobVMo79I3HEACPRN7ylhu96690DsJ7QkvEQD6LPqw82XODuM+T4o
+            UcFh2SmQu/r0eCIpqES5CtthvUQ62sQxAULDe4QRic1kJRDQiuP0HsReEPebT/bjaR2RY
-          u9kJLLhPhZEALGE9yga4RC6YxfWx1KbJRr74vu5ctxTffuDQGwHjYYf76B0TPuX72UuaP
+            YEFKcHZnafvr7Sl42Yo8g3ETqb30Hfvblsd8ga43zD+gzGfWzdH4JiTapjxoA1ZhCrgdY
-          MqG2F1M9Agr0WpTufyXD/33a+G4iybR0kY21cfv6TEYsock43d8k2ygaPgKqUHFQ5EEia
+            VxoKo3EWT0rHvnvyxA0EmUD11chzktOXlYIj+ayizirzFYFcUK9zu9urLAZCqGW4e0EXC
-          PiMzt/6vKATl+EUZEJIbqLlP0GyB6RTHylnzSjrInQEumOcsZPx0zhW0hvrs1M8L1WQqQ
+            l7wBWZ+vQiP7JRsxzeVZ2zQ8V02EFM7FZYLlOVDaC+XXEhHjr8RTgBJL45Mev1nMRLdi9
-          VksKhsXrJPO9AS2+/7GUC3+Epsui7R/4A52JK2L73iNh4S+BwBIMMqruC9msbNVPtzEPd
+            MToYkW5Ni95ZhgSWB4vQbRHvYaAMQ4e/6vqQw9nBx8vPLjutybwAu0P+vycqM4rbqc4PQ
-          HzKPwH9EkgIRZqvpu7oP9EHzKmsaYk/dRBWSwZ9f9E1GRiTuQ11DoI2km4iTJI=
+            aM6Um0+5X08TTc82+K+byljMSw5LZ9Ck9GWzeSaSt5MOy0h3PHZPBVORgv8Ed2DIZlGOa
+            SPr5pWRtrpvv5IHpcyaatdygSMqL3wKMCM8y+tcsUcd5AYen2nGVZ2hLv1RpMI=
+        api_token: !encrypted/pkcs1-oaep
+          - ab+gmJlLaoVMvcl/VTWxgn4p+H/xts91NtzK9Ce3yhkfgKb8D8FIkSDX7EXE39KAx5H3h
+            MCKeuPfZ1TNuwiq04ROFTU3uj3GkvuYMPTqbnnTetO+bN5rbQUYeMJKPicfUmY1uxuijY
+            er6eTLOWxT5YkmHX5ArCVkdDPcXeDARF4ujUnLqt2mxoyRJsn6v495gNg1nS4YmYq/C6R
+            s8TRBfzqJCvwUPSS84vhZk3r3Nx2qG/ndHneRZpAGMDlFmIgKJsZv5vWZ8QftIrToa+OO
+            r1q37Rf8/Plt1cU4OKN8cMUYvRMjH2Zfy1ioNySDG91qUMhzy3yGyakAfZZBruK02wvws
+            /4PJgCGC55BNZ0phLzCrwsgWsalLOqrt+NzMwPwnecemJnDqT0o7EB8LjtPYzy1e8iA3U
+            dWJrwa1kWTZInB/Adv0CFS972zgygC0l0nRGnl3wje65w7h4CdxLwfT5FXsBtlE4PgWW2
+            zK7UIJk3c61loYKZSllwCi/046lPZWhFq31fYIrUwlPDRyTqI3WvE9ns3Ow5rzGdLGgN+
+            YrzUOdJFHC44rUDEgeRsMC4ssj6lqVzM5Gl3PRd8DfdLkYkg3NeDJqGtrTO8bnj+kv6Nl
+            KpMEnTeMw7AoFybtgvGaeajozvj+wlAsmel3RnVi8oioLrwi8GrVFzUshgxW80=
 
 - job:
     name: zuul-registry-build-image
-    description: Build and test a Docker image.
+    description: Build and test a container image.
-    parent: opendev-build-docker-image
+    parent: opendev-build-container-image
     allowed-projects: zuul/zuul-registry
     run: playbooks/functional-test/run.yaml
     post-run: playbooks/functional-test/post.yaml
@@ -28,9 +40,13 @@
     provides: zuul-registry-container-image
     nodeset: ubuntu-jammy
     vars: &image_vars
-      docker_images:
+      promote_container_image_method: intermediate-registry
+      promote_container_image_job: zuul-registry-upload-image
+      container_command: docker
+      container_images:
         - context: .
-          repository: zuul/zuul-registry
+          registry: quay.io
+          repository: quay.io/zuul-ci/zuul-registry
           target: zuul-registry
           tags:
             # If zuul.tag is defined: [ '3', '3.19', '3.19.0' ].  Only works for 3-component tags.
@@ -39,15 +55,15 @@
 
 - job:
     name: zuul-registry-upload-image
-    parent: opendev-upload-docker-image
+    parent: opendev-upload-container-image
-    description: Build and test a Docker image and upload to Docker Hub.
+    description: Build and test a container image.
     allowed-projects: zuul/zuul-registry
     run: playbooks/functional-test/run.yaml
     post-run: playbooks/functional-test/post.yaml
     nodeset: ubuntu-jammy
     secrets:
-      name: docker_credentials
+      name: container_registry_credentials
-      secret: zuul-registry-dockerhub
+      secret: zuul-registry-registry-credentials
       pass-to-parent: true
     requires:
       - python-builder-3.10-bullseye-container-image
@@ -57,12 +73,12 @@
 
 - job:
     name: zuul-registry-promote-image
-    parent: opendev-promote-docker-image
+    parent: opendev-promote-container-image
-    description: Promote previously uploaded Docker image.
+    description: Promote previously uploaded container image.
     allowed-projects: zuul/zuul-registry
     secrets:
-      name: docker_credentials
+      name: container_registry_credentials
-      secret: zuul-registry-dockerhub
+      secret: zuul-registry-registry-credentials
       pass-to-parent: true
     nodeset:
       nodes: []
@@ -96,11 +112,11 @@
     release:
       jobs:
         - opendev-release-python
-        - upload-docker-image:
+        - upload-container-image:
             secrets:
-              name: docker_credentials
+              name: container_registry_credentials
-              secret: zuul-registry-dockerhub
+              secret: zuul-registry-registry-credentials
               pass-to-parent: true
             vars:
               <<: *image_vars
-              upload_docker_image_promote: false
+              upload_container_image_promote: false

playbooks/functional-test/docker-compose.yaml

@@ -4,7 +4,7 @@ version: '2'
 
 services:
   registry:
-    image: zuul/zuul-registry
+    image: quay.io/zuul-ci/zuul-registry
     volumes:
       - "./conf/:/conf/:z"
       - "/tmp/registry-test/tls/:/tls:z"

playbooks/functional-test/restricted/docker-compose.yaml

@@ -4,7 +4,7 @@ version: '2'
 
 services:
   registry:
-    image: zuul/zuul-registry
+    image: quay.io/zuul-ci/zuul-registry
     volumes:
       - "./conf/:/conf/:z"
       - "/tmp/registry-test/tls/:/tls:z"

playbooks/functional-test/run.yaml

@@ -1,7 +1,7 @@
 # This installs docker and runs a buildset registry
 - hosts: all
   roles:
-    - build-docker-image
+    - build-container-image
 
 - hosts: all
   name: Set up for tests
@@ -30,9 +30,9 @@
       include_tasks: setup.yaml
 
 - hosts: all
-  name: Run docker standard registry test
+  name: Run container standard registry test
   tasks:
-    - name: Run docker test tasks
+    - name: Run container test tasks
       include_tasks: docker.yaml
 
 - hosts: all

playbooks/functional-test/setup.yaml

@@ -61,7 +61,7 @@
   command: "cp /run/user/{{ ansible_user_uid }}/auth.json {{ workspace }}/containers-auth.json"
 
 - name: Create a local containers image
-  shell: buildah commit --rm $(buildah from docker.io/zuul/zuul-registry) testimage
+  shell: buildah commit --rm $(buildah from quay.io/zuul-ci/zuul-registry) testimage
 
 - name: Ensure image file is not present
   file: