Revert "Migrate ptgbot to quay.io"

This reverts commit 260f6f3624.
This is a partial revert as test fixups are not reverted.

OpenDev is moving back to docker.io to preserve speculative container
image testing functionality.

Change-Id: I5a1404c27f09f2cf2c1d7dd9b74c300052658559

.zuul.yaml

@@ -1,24 +1,22 @@
 - secret:
-    name: ptgbot-opendev-quayio
+    name: ptgbot-opendev-dockerhub
     data:
-      quay.io:
-        username: opendevorg+ptgbotrobot
-        password: !encrypted/pkcs1-oaep
-          - wLxGIpS7huEhC7KIT++Zl7i+fNIVhJnm9YRjTabCMhoPRzKnnpiLETdiAb+63n7xXaqoA
-            YRUt1zsVS3EHIEAK6chmH2hSq9sHxweCIAgq6H1gVwN+DOYYyv2BfHzUIQcFs3zpsdNLe
-            vXC4q6GcIwAwe9qSOJ875CDsChvlbyhpwEi5C+o+w6XOO/uZMNRCL4B+vssM6IXL+inmb
-            k4n1okvLvLqniQFrWvB1c1AGMJ/9lOKLdHfducd1FqKEist1K6QaA1TR1y19P9fubN78W
-            9D707NhvcicrCZjwrx1r0Gidi40E9cyNHot3yCeWCQeJ5+6Qku3AXsxTascyaF76LVQMy
-            FKkHv2pL2PabtQzdj96doaGJ8upwORYGLsEILMXCjRoH9HgRx3NNIfZEvQFcvDFz92gnm
-            66BCiE1EWfz2Q9nYcfKruGoSKTgLcHL3beoGsSeGJtImMDC3IR+uDjom8fekm8XBu4Pr6
-            bQ8VtV30IkSwJXFc7Rtz/3f6qaj0e9wgfkdZbulxhFxBJHoeoYaJHxZGRKiELpTNnqM3Y
-            1Pkn18xNmfrZjGxR+88WI5XO+E+RJpn76cVitRFA6XIq6tjWSxWtMdUFtptN69HcR7rQ0
-            gkYNk7+UIP78gWzbK0/uv2rXwnGw35yVotBZdpyMaiUv5eq+3iwKCW1+oDGjbw=
-        # No api token as we won't need to create new repos for ptgbot
+      username: opendevzuul
+      password: !encrypted/pkcs1-oaep
+        - tpQrxd7cqPwjjKsSbDOH0GqNuFZudJDQvY43qFV8tmKh3zRTjfA5uVX5b3J60SHHYIez9
+          9W/SU0pVm0VfH0iL9plMKoVij6LLpFlxGePiab7SimjQuiDoP2aBles7AbmdCxyNrs6M5
+          WCHSsg+6bE79z0r2+2+yoFYxGlbY7beRpHXkPxGpFn/g9YpOFnAch3UcnAEDnZHamxufp
+          8wIZ//UYP4Z6hwv0PcX9caw/MU8bnUGDQXBtjErohtsi8+cELKXvHBT4WU33wpf//C6MD
+          KQ3nd7NJfDtIYaN4PGOw2mlbQFq0lF4PfxlhOHjC2+k9vz+EoW85Hkfcw986CE+JINq3p
+          k5t8GbXTDu86kkBzU6Gk+D7EVOluKZbGuTB4pcyZdjlMbty274y8xQXnplTp2rKIAdPeP
+          G1AcXEvZmfR0YEKg8UuR+ZJQx3Au1uEJAEpkNwH1Tbt54K/qyw1gAQDcHHkJ3odsKJe5V
+          c97Kn7roGCzwi7UWOd+XR0hvcNTUfotyBFQJzDe1+NHc6IQGQ1DeBVz5FD1JIVoj+W65E
+          XymsiQmZ+B+AxFnINS8PUTkJtlQc7zoMP/dtcYTbxtJB3XJQTOiaD00KGmr6RDWu3Uuw+
+          T6l/0vVdT7SeDY0v5wib2Elgl1Vnmxkte9oiUD9F++dW/rw42Cjlq5WqRlodaU=
 
 - job:
     name: ptgbot-build-opendev-image
-    parent: opendev-build-container-image
+    parent: opendev-build-docker-image
     description: Build OpenDev Docker images for statusbot
     requires:
       - python-builder-3.9-bullseye-container-image
@@ -26,21 +24,14 @@
     provides: ptgbot-container-image
     vars: &ptgbot_opendev_image_vars
       zuul_work_dir: src/opendev.org/openstack/ptgbot
-      promote_container_image_method: intermediate-registry
-      promote_container_image_job: ptgbot-upload-opendev-image
-      container_command: docker
-      container_images:
+      docker_images:
         - context: .
-          registry: quay.io
-          repository: quay.io/opendevorg/ptgbot
-          namespace: opendevorg
-          repo_shortname: ptgbot
-          repo_description: An IRC bot for managing team gatherings
+          repository: opendevorg/ptgbot
           target: ptgbot
 
 - job:
     name: ptgbot-upload-opendev-image
-    parent: opendev-upload-container-image
+    parent: opendev-upload-docker-image
     description: Build OpenDev statusbot Docker images and upload to Docker Hub.
     requires:
       - python-builder-3.9-bullseye-container-image
@@ -48,18 +39,18 @@
     provides: ptgbot-container-image
     vars: *ptgbot_opendev_image_vars
     secrets:
-      - name: container_registry_credentials
-        secret: ptgbot-opendev-quayio
+      - name: docker_credentials
+        secret: ptgbot-opendev-dockerhub
         pass-to-parent: true
 
 - job:
     name: ptgbot-promote-opendev-image
-    parent: opendev-promote-container-image
+    parent: opendev-promote-docker-image
     description: Promote previously uploaded ptgbot Docker images.
     vars: *ptgbot_opendev_image_vars
     secrets:
-      - name: container_registry_credentials
-        secret: ptgbot-opendev-quayio
+      - name: docker_credentials
+        secret: ptgbot-opendev-dockerhub
         pass-to-parent: true
 - project:
     check:

Dockerfile

@@ -1,10 +1,10 @@
 
-FROM quay.io/opendevorg/python-builder:3.9-bullseye as builder
+FROM docker.io/opendevorg/python-builder:3.9-bullseye as builder
 
 COPY . /tmp/src
 RUN assemble
 
-FROM quay.io/opendevorg/python-base:3.9-bullseye as ptgbot
+FROM docker.io/opendevorg/python-base:3.9-bullseye as ptgbot
 
 COPY --from=builder /output/ /output
 RUN /output/install-from-bindep