From b9ab9ba76be4e131b781d7bc052663224e5f7576 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 24 May 2023 10:20:52 -0700
Subject: [PATCH] Revert "Move assets image to quay.io"

This reverts commit 7f88fc7d4aa332ba51ed45f2689d15819ed19692.

We found a deficiency in Docker when working with images hosted outside
of docker.io which necessitates this revert.

Change-Id: I8b16fe3e5297cab04685e0ceb6b8277a2754b3fb
---
 assets/Dockerfile                |  2 +-
 zuul.d/docker-images/assets.yaml | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/assets/Dockerfile b/assets/Dockerfile
index 0f350b30f1..ea62734c54 100644
--- a/assets/Dockerfile
+++ b/assets/Dockerfile
@@ -1,4 +1,4 @@
-# Fri May  5 18:32:00 UTC 2023 - trigger rebuild
+# Wed May 24 17:17:08 UTC 2023 - trigger rebuild
 
 FROM scratch
 COPY donors /donors/
diff --git a/zuul.d/docker-images/assets.yaml b/zuul.d/docker-images/assets.yaml
index 31ab01fb19..8e71fe1d0a 100644
--- a/zuul.d/docker-images/assets.yaml
+++ b/zuul.d/docker-images/assets.yaml
@@ -3,16 +3,11 @@
     name: system-config-build-image-assets
     provides: assets-container-image
     description: Build Opendev assets bundle
-    parent: system-config-build-container-image
+    parent: system-config-build-image
     vars: &assets_vars
-      promote_container_image_job: system-config-upload-image-assets
-      container_images:
+      docker_images:
         - context: assets
-          registry: quay.io
-          repository: quay.io/opendevorg/assets
-          namespace: opendevorg
-          repo_shortname: assets
-          repo_description: Container image containing web assets for multiple sites.
+          repository: opendevorg/assets
     files: &assets_files
       - assets/
 
@@ -20,13 +15,13 @@
     name: system-config-upload-image-assets
     description: Build and upload assets bundle
     provides: assets-container-image
-    parent: system-config-upload-container-image
+    parent: system-config-upload-image
     vars: *assets_vars
     files: *assets_files
 
 - job:
     name: system-config-promote-image-assets
     description: Promote a previously published assets bundle image to latest.
-    parent: system-config-promote-container-image
+    parent: system-config-promote-image
     vars: *assets_vars
     files: *assets_files