From fee8026623a9ee3d63bc5393fd8f1986fe6dc2c4 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 24 May 2023 13:47:51 -0700
Subject: [PATCH] Revert "Migrate grafyaml container images to quay.io"

This reverts commit 5920a711305d5254f954147da8420950828fe295.
This reverts commit 757e2d24c82ee358088486c0d06e47029e016c76.

This is a partial revert as test fixups are left as is.

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

Change-Id: I5cf061211df28a596271a033fb4b8bb5916ab998
---
 .zuul.yaml | 61 +++++++++++++++++++++++-------------------------------
 Dockerfile |  4 ++--
 2 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index c58605e..5d5c183 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,24 +1,22 @@
 - secret:
-    name: grafyaml-opendev-quayio
+    name: grafyaml-dockerhub
     data:
-      quay.io:
-        username: opendevorg+opendevrobot
-        password: !encrypted/pkcs1-oaep
-          - hSTvQh0pD1SNTf5tCe+v5cgZFQKEsW1Ca/tYN7nk96AC95xqju9lckJvs+X7mPK4XX3wn
-            Cu2fAKY26Jt7HL1IQEtqXMnYARPoEXJbqbS5IPVdyzOil/PuQBVShFOMbXAOYMzJm5JNN
-            0i7c9q2+4bv7YsVEIOZjhL5Mykhfk+nBPasubVOP390js12t0kBlm4TBTRCimf/YzetpK
-            uoA2TBVai2aqSGBSvzXBPQb3D+l/EH1LsCY7irAv+pMr3k33x6u6I+3ejC2z33O9bv8us
-            OsToyWa98W9ZviJ8mIVAPr8G6NCfaVUY3Hoa60xRZSbIot4TlrDjK8gA4Blz6eBaS9Ho9
-            0YOOBlUmofGBREQM4mV8419aaaJwVo+pEmaehJMu+pDphNfzJD2UI61XLV0WoY1jWdbPn
-            /Y9xn54bVnzc7vO3s32ckDdrpQ0y7QsppHpuyiEOo0xdvkv9furOog/phzqFz1XWWHNra
-            co6NSqmTrKHJQBijn37F6PHLt+fukmP/2mFl/SYM9+ZTxtqgb3+BUHouZRTdkuDD/HZpO
-            7UBlM0S78ktwAlsACkb7C6erxT+jZ/7/ydq/3vAXTEh/jUCBbeDiciwcXxnxuPMKZK8AH
-            Cf18aChlq4BLqpcZYCAsIiXzEU55K/T4rPyg/d7NfIq9LiNSwNRCMTqq+zwHMY=
-        # No api token because grafyaml won't need to create new repos
+      username: opendevzuul
+      password: !encrypted/pkcs1-oaep
+        - bbW9hdHj1GzhXJky9VkO/FKqiwWJDvaJGn+z/rB/i4ssGu8keRiFCEXHBzzioDe9OWlux
+          aFNz1T3x7cUlWMEQ0ZDvD7GeQ9dRSo3lWctoS0P4iMClmZKjMDI+TSuLdVg2GlH6CtMiH
+          b0Flw5j4BsP2VtbN71KOs+J8ybLVYivdAJmDGVST4gBBI1vL5RHIMr98BEx7oGqcB+h/1
+          FtRIWqCjWr+Jvj6C+rdGKiocb77sJyFfZ1X7H97o5TETQeYs118kBP0iWv5FksoflUQU0
+          cckE6u0oDrPx/4ea3pqKPLD9/B8/vAX+WUd1y2jUnmUmZvnEeTxekjXFUTrCVLqZc1FTC
+          ZbbL/CQc/25QOI7sEeUigcYkPINhs6OsEe36gE2fKIjWEdVdunNOMxeQ/RS86OttzGlcP
+          x+ADrUTQjkuEnxZo2WTYL4kHuzPr3//DsPjLJBq8hoKXlT3fpdH5pHaiVBC3oIVCWfzSa
+          1LfX7XL0eFIwEc99gAfbfhljE9P77ZWX2zD9reyNNH4VCI9u92RKF5+VZ5ResOdOA0z0r
+          sMYue1hqHYLLQq9O42t3PBfVMrS1V+GcJ8oWn+9sOll16kQw+wVpLmba/0Btdq0MSdWxc
+          itrO3WwA2kqDd6qtHYAd0c9BEx8HDt66Rl56AN30LBtPRTdhNc93QDDJlPvqZE=
 
 - job:
     name: grafyaml-build-image
-    parent: opendev-build-container-image
+    parent: opendev-build-docker-image
     description: Build a Docker image of grafyaml
     allowed-projects: opendev/grafyaml
     timeout: 2700
@@ -30,22 +28,15 @@
     dependencies:
       - opendev-buildset-registry
     vars: &grafyaml_image_vars
-      promote_container_image_method: intermediate-registry
-      promote_container_image_job: grafyaml-upload-image
-      container_command: docker
-      container_images:
+      docker_images:
         - context: .
-          registry: quay.io
-          repository: quay.io/opendevorg/grafyaml
-          namespace: opendevorg
-          repo_shortname: grafyaml
-          repo_description: A grafana graph management tool.
+          repository: opendevorg/grafyaml
           tags:
             &imagetag "{{ zuul.tag is defined | ternary([zuul.get('tag', '').split('.')[0], '.'.join(zuul.get('tag', '').split('.')[:2]), zuul.get('tag', '')], ['latest']) }}"
 
 - job:
     name: grafyaml-upload-image
-    parent: opendev-upload-container-image
+    parent: opendev-upload-docker-image
     description: Build the grafyaml Docker image and upload to Docker Hub.
     timeout: 3600
     requires:
@@ -54,18 +45,18 @@
     provides: grafyaml-container-image
     vars: *grafyaml_image_vars
     secrets:
-      - name: container_registry_credentials
-        secret: grafyaml-opendev-quayio
+      - name: docker_credentials
+        secret: grafyaml-dockerhub
         pass-to-parent: true
 
 - job:
     name: grafyaml-promote-image
-    parent: opendev-promote-container-image
+    parent: opendev-promote-docker-image
     description: Promote previously uploaded Docker image.
     vars: *grafyaml_image_vars
     secrets:
-      - name: container_registry_credentials
-        secret: grafyaml-opendev-quayio
+      - name: docker_credentials
+        secret: grafyaml-dockerhub
         pass-to-parent: true
 
 - project:
@@ -90,11 +81,11 @@
         - grafyaml-promote-image
     release:
       jobs:
-        - upload-container-image:
+        - upload-docker-image:
             secrets:
-              name: container_registry_credentials
-              secret: grafyaml-opendev-quayio
+              name: docker_credentials
+              secret: grafyaml-dockerhub
               pass-to-parent: true
             vars:
               <<: *grafyaml_image_vars
-              upload_container_image_promote: false
+              upload_docker_image_promote: false
diff --git a/Dockerfile b/Dockerfile
index 094e87b..0e6ae74 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,12 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM quay.io/opendevorg/python-builder:3.10-bullseye as builder
+FROM docker.io/opendevorg/python-builder:3.10-bullseye as builder
 
 COPY . /tmp/src
 RUN assemble
 
-FROM quay.io/opendevorg/python-base:3.10-bullseye
+FROM docker.io/opendevorg/python-base:3.10-bullseye
 
 COPY --from=builder /output/ /output
 RUN /output/install-from-bindep