Reapply "Move system-config irc bots into quay.io"

This reverts commit 8ccab5e967.

We reverted this change originally due to problems discovered with
docker pulling images from locations other than docker hub. The
eavesdrop server has since been updated to Ubuntu Noble and runs the
containers with podman which has no issues with alternative image
locations. Switch back to publishing the containers on quay.io.

Note this change revers the old change but does make some slight edits
to resolve conflicts around python base image versions.

Change-Id: Ic3a7d59f0ba57e93fca2dff800f1b490daab8f14

playbooks/roles/accessbot/files/accessbot

@@ -17,4 +17,4 @@
 exec docker run --rm --net=host \
   -v/etc/accessbot:/etc/accessbot \
   -v/var/log/accessbot:/var/log/accessbot \
-  docker.io/opendevorg/accessbot
+  quay.io/opendevorg/accessbot

playbooks/roles/accessbot/tasks/main.yaml

@@ -33,4 +33,4 @@
     logrotate_file_name: /var/log/accessbot/accessbot.log
 
 - name: Pull latest image
-  command: docker pull docker.io/opendevorg/accessbot
+  command: docker pull quay.io/opendevorg/accessbot

playbooks/roles/limnoria/files/docker-compose.yaml

@@ -1,6 +1,6 @@
 services:
   ircbot:
-    image: docker.io/opendevorg/ircbot:latest
+    image: quay.io/opendevorg/ircbot:latest
     network_mode: host
     restart: always
     logging:

playbooks/roles/matrix-eavesdrop/files/docker-compose.yaml

@@ -1,6 +1,6 @@
 services:
   eavesdrop:
-    image: docker.io/opendevorg/matrix-eavesdrop:latest
+    image: quay.io/opendevorg/matrix-eavesdrop:latest
     network_mode: host
     restart: always
     logging:

zuul.d/docker-images/accessbot.yaml

@@ -2,13 +2,18 @@
 - job:
     name: system-config-build-image-accessbot
     description: Build a accessbot image.
-    parent: system-config-build-image
+    parent: system-config-build-container-image
     requires: python-base-3.12-bookworm-container-image
     provides: accessbot-container-image
     vars: &accessbot_vars
-      docker_images:
+      promote_container_image_job: system-config-upload-image-accessbot
+      container_images:
         - context: docker/accessbot
-          repository: opendevorg/accessbot
+          registry: quay.io
+          repository: quay.io/opendevorg/accessbot
+          namespace: opendevorg
+          repo_shortname: accessbot
+          repo_description: IRC acl management bot
     files: &accessbot_files
       - docker/accessbot/
       - docker/python-base/
@@ -16,7 +21,7 @@
 - job:
     name: system-config-upload-image-accessbot
     description: Build and upload a accessbot image.
-    parent: system-config-upload-image
+    parent: system-config-upload-container-image
     requires: python-base-3.12-bookworm-container-image
     provides: accessbot-container-image
     vars: *accessbot_vars
@@ -25,6 +30,6 @@
 - job:
     name: system-config-promote-image-accessbot
     description: Promote a previously published accessbot image to latest.
-    parent: system-config-promote-image
+    parent: system-config-promote-container-image
     vars: *accessbot_vars
     files: *accessbot_files

zuul.d/docker-images/eavesdrop.yaml

@@ -2,22 +2,27 @@
 - job:
     name: system-config-build-image-matrix-eavesdrop
     description: Build a matrix-eavesdrop image.
-    parent: system-config-build-image
+    parent: system-config-build-container-image
     requires: &matrix-eavesdrop_requires
       - python-base-3.12-bookworm-container-image
       - python-builder-3.12-bookworm-container-image
     provides: matrix-eavesdrop-container-image
     vars: &matrix-eavesdrop_vars
-      docker_images:
+      promote_container_image_job: system-config-upload-image-matrix-eavesdrop
+      container_images:
         - context: docker/matrix-eavesdrop
-          repository: opendevorg/matrix-eavesdrop
+          registry: quay.io
+          repository: quay.io/opendevorg/matrix-eavesdrop
+          namespace: opendevorg
+          repo_shortname: matrix-eavesdrop
+          repo_description: A matrix log collection bot.
     files: &matrix-eavesdrop_files
       - docker/matrix-eavesdrop/.*
 
 - job:
     name: system-config-upload-image-matrix-eavesdrop
     description: Build and upload a matrix-eavesdrop image.
-    parent: system-config-upload-image
+    parent: system-config-upload-container-image
     requires: *matrix-eavesdrop_requires
     provides: matrix-eavesdrop-container-image
     vars: *matrix-eavesdrop_vars
@@ -26,6 +31,6 @@
 - job:
     name: system-config-promote-image-matrix-eavesdrop
     description: Promote a previously published matrix-eavesdrop image to latest.
-    parent: system-config-promote-image
+    parent: system-config-promote-container-image
     vars: *matrix-eavesdrop_vars
     files: *matrix-eavesdrop_files

zuul.d/docker-images/ircbot.yaml

@@ -2,7 +2,7 @@
 - job:
     name: system-config-build-image-ircbot
     description: Build a ircbot image.
-    parent: system-config-build-image
+    parent: system-config-build-container-image
     requires: &ircbot_requires
       - python-base-3.12-bookworm-container-image
       - python-builder-3.12-bookworm-container-image
@@ -10,10 +10,15 @@
     required-projects: &ircbot_required_projects
       - opendev/meetbot
     vars: &ircbot_vars
-      docker_images:
+      promote_container_image_job: system-config-upload-image-ircbot
+      container_images:
         - context: docker/ircbot
           target: ircbot
-          repository: opendevorg/ircbot
+          registry: quay.io
+          repository: quay.io/opendevorg/ircbot
+          namespace: opendevorg
+          repo_shortname: ircbot
+          repo_description: A limnoria + meetbot IRC bot
           siblings:
             - opendev.org/opendev/meetbot
     files: &ircbot_files
@@ -21,7 +26,7 @@
 - job:
     name: system-config-upload-image-ircbot
     description: Build and upload a ircbot image.
-    parent: system-config-upload-image
+    parent: system-config-upload-container-image
     requires: *ircbot_requires
     provides: ircbot-container-image
     required-projects: *ircbot_required_projects
@@ -31,6 +36,6 @@
 - job:
     name: system-config-promote-image-ircbot
     description: Promote a previously published ircbot image to latest.
-    parent: system-config-promote-image
+    parent: system-config-promote-container-image
     vars: *ircbot_vars
     files: *ircbot_files