From bce6c41bbfe649aa889d854cd0526da2a6a63069 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jim@acmegating.com>
Date: Fri, 21 Apr 2023 10:13:36 -0700
Subject: [PATCH] Publish container images to quay.io

Change-Id: If15a747a05a3ae6f1b5864e333aa63a42f000c65
---
 .zuul.yaml | 60 ++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 22 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index d6eabe9..ddc40af 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,44 +1,60 @@
 # Image building jobs
 - secret:
-    name: gcp-authdaemon-dockerhub
+    name: gcp-authdaemon-registry-credentials
     data:
-      username: zuulzuul
-      password: !encrypted/pkcs1-oaep
-        - HRBNCurib3EWbZJ7ZT7qHXZJVWBz83OWdebBDGTJKShdh9BO3yfBYws48YYDx3D3+U/ZA
-          JvagyvXu4faFEQrAyKg+MwYrGKfak7u+daOeNYsPtETpYfvPGb1h09cXUX8eMVqtzNket
-          BMXg/KcoGJwGwpvkYlMG/DhnqoTZ48LQs3V8B499uSWYizJHTnetgoGk15trE1Z90xaoZ
-          r/cj/KbRs4NGiFLkdLX7L0RXgZG68HHfCpdTgCyUtoqjaC3nWIAqX9wqCwBq++T9ye8Dl
-          XAhIbyouYLDuZFwywupiv4dJhpea8F0PRVYv/uDf63x1lj8+Ga/SN+fK1NZrf/s44oH3W
-          R0oD95B/hq+QiRSRzzL/3SxnsHzLAoal21UHwa+BQrGCyr0ggKkVLx+y0SMHOZeLV7vb8
-          XmCwaP7/LvJKIH/hggLsaleYlUlgJ6uyXmgbQl0yLPI3w8q8aRGLkXfAqBNFKqwprUU7l
-          +nyExeVe1XfkyloOkk7GL6tdG6g9Sj3A1hYxshACF9+irra5cgYzNi4U3shTBvmdf3tK9
-          5Bh4ePAgwh4S+lgXcmtd7Li9nBhkobNPC1VbDZigV14c04Juep10Y3O2wbFgOY/znG6d8
-          c8y81M5qEpjJn7pmJ0WsGH+g8oH+jdVKTNS70ZRsaQQijaDigNMb56CbQIc+xc=
+      quay.io:
+        username: zuul-ci+opendevzuul
+        password: !encrypted/pkcs1-oaep
+          - 3wMBFpzAkIk+QRKU5YAUKQN6NM3YkJBkNDHU+8cjpJmmh4W32VoM259GC3Wly+nh88POZ
+            6m+vMgSCmjybNN5847dgy5moqENpdb/efNffhL59L3mos7qWd7+tDOxtoKMOHaR1IDnpr
+            ygfFB2tbPQBbSKp/H1KfA9t7pjLzE6PCdd08hv2M5ggD0VebiuN7vxQzjHyBoVrp8zlAk
+            l347Cw2uklfgSfwuT1cA0w9sPzz4h1IyhqIcINGniw4PWTvVpzdMkdZ909K5zirk156rY
+            v3ttxOeiKERj2AwoaGE2gMeLszAVswGH9uAQANSV8CkxbRXelRkvEb2U/4sP15dm+sV0A
+            ZAZCU3CVaqD2BWiD1M0ozfyC6vgmSswBg0FL63VNBUK8aEhLd8YtyumIeFO6tWmAUloDV
+            uW5pD2YHNKJo0dbgquLYVAAVDcTitb/Ev5U3E4AByYtRvs0FUsaemYOx/eh7NEZlyGE/E
+            49BXNuR6gC7ZmeV0iM0iQO9tpqXjBGO8gjSpCzuYAJYcnpAZymI6LokoU8RjQF+hoEBuF
+            4G4QpX80ciY9MHqBnxdIdBNKRrexRIRIPAHyXPSnbB1dVWPjKdJML+ENUwMHoShdVU0ww
+            /UCxZyka108hvJ2SWCXpKnVHYsBjou5Yzw4ABEuY6Z4w0DBu4qqjpmKeuXtIqs=
+        api_token: !encrypted/pkcs1-oaep
+          - vZxeNHRPX8pHT3BJRlVev0XNgZANWrgG1MOMOzNVo3ZbZyUp5IJDP8fOS91XldVPtALdL
+            IqVGT7lHQZfVGmqE0hy7/+QZ77jQwqbIySG0i2+xzihylWtBU0+CXEUZi8/xfdxWuyshS
+            I8LtjoiQdRl1VaIQcY4DEWT0kaMlEl1tHXL2oIJROQsCDbwiTD+gFsBAiLm9LXhK+/gY4
+            IuED2vb2qFtB2tATwRUjSi6cNNOIP3eMX/bgZEj8VPd1GawY5GBZ+NNiAqBpcKVgHViIk
+            2ghO7oKe0Gl1fcKRzMmYPC3DHBp/ZPiO24T4hnn5WIqk10XUmEy00242S7Tr0jU92WUhP
+            A/gb74vTefjzsErh7UfpnqlHN6WKLd98zo6w4R6rm6qDDTqqkbiU3EyGjpDeGa9Bgzfw+
+            nWYNd6KB8sKcgDdjpjqGe8/y6jblG09ZnLt44UMFLpwG2dQkrFB7O1u1imzcMXlSh4EqI
+            j8uMY5ZLBK/hXZW+5BmM0Zm38pGAcOyEssiVh5JjAXbEZPhUjnGlKm9IXk9bhCOc3VoTZ
+            xEavSUjd+o6wdba90VOnSFKJPBV14xH7jjG+GAt1DOMSfiwKqeXviAR/7Nk0fLu9ZzlGs
+            C/2BtlV23Sx7WhDfjyZ45qnfKHUENKW95Shyz6JoaIThOVQ1sXrNXn9KrNROrw=
 
 - job:
     name: gcp-authdaemon-build-image
-    parent: opendev-build-docker-image
+    parent: opendev-build-container-image
     vars: &gcp_authdaemon_image_vars
-      docker_images:
+      promote_container_image_method: intermediate-registry
+      promote_container_image_job: gcp-authdaemon-upload-image
+      container_command: docker
+      container_images:
         - context: .
-          repository: zuul/gcp-authdaemon
+          registry: quay.io
+          repository: quay.io/zuul-ci/gcp-authdaemon
 
 - job:
     name: gcp-authdaemon-upload-image
-    parent: opendev-upload-docker-image
+    parent: opendev-upload-container-image
     vars: *gcp_authdaemon_image_vars
     secrets:
-      name: docker_credentials
-      secret: gcp-authdaemon-dockerhub
+      name: container_registry_credentials
+      secret: gcp-authdaemon-registry-credentials
       pass-to-parent: true
 
 - job:
     name: gcp-authdaemon-promote-image
-    parent: opendev-promote-docker-image
+    parent: opendev-promote-container-image
     vars: *gcp_authdaemon_image_vars
     secrets:
-      name: docker_credentials
-      secret: gcp-authdaemon-dockerhub
+      name: container_registry_credentials
+      secret: gcp-authdaemon-registry-credentials
       pass-to-parent: true
 
 - project: