From 0a29764ca5c65a2ae4b89b47194e984719167056 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 6 Aug 2025 10:09:28 -0700
Subject: [PATCH] Reapply "Move gerritbot to quay.io"

This reverts commit d4758daf51d679040710577baf0cb364fca7e0b0.

We reverted this change originally because docker doesn't work great
with images hosted in places other than docker hub in some situations.
Since then the eavesdrop server has been updated to Ubuntu Noble and is
running podman so we can move back to quay. Do so.

Change-Id: Ib248ee2c548c2efce73c92010f3eccad352a07a2
---
 .zuul.yaml | 53 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 777f116..312c4a6 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,22 +1,24 @@
 - secret:
-    name: gerritbot-opendev-dockerhub
+    name: gerritbot-opendev-quayio
     data:
-      username: opendevzuul
-      password: !encrypted/pkcs1-oaep
-        - 1lrelk7zn4fl31rF2n/+erP4aYWXWfHMnt7piYyBtfSlbIh3z+u8BIDY5/LXU9bswwxVR
-          IKRmMSME8sH4wE9+DAmsGiiuEuVdq2fKu7jF2doL86EVYsOMYtOJak7jN1l5mOHWn/IZy
-          lKATn/OaAHosX8un30T9pSn4cNCtsdbIRxxjXJUdprZfbcDHAJ5Ezf5PsBs9Szg/SUZWU
-          DLVvAYoTpyYHTHQMCf1idKevAnewrDLtPuIjVf0FWmMsRURBh5HVZILVn6NFCHQZR93ca
-          mzNpQOaw/v/F+hjtKZSFRbuwuOe1st5qK1KLbzb0xYJ0DhM5bIKO/O3gTKwWV30+0rEJC
-          geouNC+qhhVRGAqvA3y1DJZNYcY4lGTYE2hMhaIKBm1tj1UpzbexVU66NTUZ6xAzsq28c
-          D2ffLmVMeNtnZUud1JiwpeHOGB/zwpJJTcJBHI9bzn19NNF9MhnRGbaJUU69goPgc8O17
-          HD18TsHAGm4mJwLNp8zWUb0VMP06v8PHI7clRAK07FUN6Gc7mjdgGoPI1RtLoZ8Fr0Il7
-          vbfU6acyzrH/CIyF5mNvrUBuy3J6QoKElFG2pXGfZj8xKhCTbShT2rZwyZdhgONvjNWIN
-          cY8abkqFpILCTTEtByIs0A02XJLOf9XdK5R3/yPPNhv5OPSfBTwpIgwLsAJqPU=
+      quay.io:
+        username: opendevorg+opendevrobot
+        password: !encrypted/pkcs1-oaep
+          - lMz7OFZ1iC/TKVKOud9x6d8/YL7QSulEhzBu/kMJN4P/13KvAkhui5bxYYMULxsiy0ykf
+            TheFNzDWqZWGoHb9CzpafHXRz1FYSr+uNetGiqZkGdpD5LZinv4+rO09oYLzbueY6NWgC
+            Dn8A4FCzS4slLq9OWCnY2Qpmry+ny2I9UA1Vt8Aj59Kg/Aixshh+71bmhMC2tu5/JWypH
+            oStW3aK68yrX2Vq2PaD63o2LudESfkHxFFZ8n9LOeXvmsHSBWs3InybtKBjKapLQFvfDa
+            NtctkstabhKZkX/nwiyWhaab0XucJXMbIZO1Pv2kESfFiNGZSS8UEqLoLaIoYiN1BXL7+
+            s8Ks4YmLSasIfdGSt+VL7sTOUXVzUWVYgn2gCYOEwGipWuhyXMma9j33aLp1LxB/LmHQK
+            M0frDBIlEXZFMX2qETjeJLkObVXNZAOwe0t3F02g8JAdiqRGQDxpaoA8fKB3IxLkAWkBG
+            +rtsP18qAdZG7N3M6Av9gidspYRDp0aS/+NPjP2/0dKRdZxzqouH3S0fqYLCd8rtwr8Oe
+            5BKedsiIl0OYP9ti5U2EQXZn2bH0qYCdZC73n/A2ihoR+5oCk3l+nic93SMUpiO/g9BGy
+            kmNvtEZ6PmqnnqO7qHvXv547u6Sq+vt7xhA6WOhLaDI9LXV47ydBJF5gvwtcR4=
+        # No api token as we won't need to create new repos for gerritbot
 
 - job:
     name: gerritbot-build-opendev-image
-    parent: opendev-build-docker-image
+    parent: opendev-build-container-image
     description: Build OpenDev Docker images for storyboard webclient
     provides: gerritbot-container-image
     requires:
@@ -26,16 +28,23 @@
       - opendev/gerritlib
     vars: &gerritbot_opendev_image_vars
       zuul_work_dir: src/opendev.org/opendev/gerritbot
-      docker_images:
+      promote_container_image_method: intermediate-registry
+      promote_container_image_job: gerritbot-upload-opendev-image
+      container_command: docker
+      container_images:
         - context: .
-          repository: opendevorg/gerritbot
+          registry: quay.io
+          repository: quay.io/opendevorg/gerritbot
+          namespace: opendevorg
+          repo_shortname: gerritbot
+          repo_description: A Gerrit event stream IRC bot
           target: gerritbot
           siblings:
             - opendev.org/opendev/gerritlib
 
 - job:
     name: gerritbot-upload-opendev-image
-    parent: opendev-upload-docker-image
+    parent: opendev-upload-container-image
     description: Build OpenDev gerritbot Docker images and upload to Docker Hub.
     provides: gerritbot-container-image
     requires:
@@ -44,18 +53,18 @@
     required-projects: *gerritbot_opendev_required_projects
     vars: *gerritbot_opendev_image_vars
     secrets:
-      - name: docker_credentials
-        secret: gerritbot-opendev-dockerhub
+      - name: container_registry_credentials
+        secret: gerritbot-opendev-quayio
         pass-to-parent: true
 
 - job:
     name: gerritbot-promote-opendev-image
-    parent: opendev-promote-docker-image
+    parent: opendev-promote-container-image
     description: Promote previously uploaded gerritbot Docker images.
     vars: *gerritbot_opendev_image_vars
     secrets:
-      - name: docker_credentials
-        secret: gerritbot-opendev-dockerhub
+      - name: container_registry_credentials
+        secret: gerritbot-opendev-quayio
         pass-to-parent: true
 
 - project: