From 22832895245ee7b416974b5e6373e623422e877e Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Wed, 14 Sep 2022 15:49:21 -0400
Subject: [PATCH] jobs/release: move oscontainer to
 quay.io/fedora/fedora-coreos

Also keep old location active for now.

Fixes https://github.com/coreos/fedora-coreos-tracker/issues/1171
---
 jobs/release.Jenkinsfile | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/jobs/release.Jenkinsfile b/jobs/release.Jenkinsfile
index 9fd8a6541..821ccd085 100644
--- a/jobs/release.Jenkinsfile
+++ b/jobs/release.Jenkinsfile
@@ -68,8 +68,8 @@ echo "Final podspec: ${pod}"
 def pod_label = "cosa-${UUID.randomUUID().toString()}"
 
 // Destination for OCI image push
-// TODO: Change this to quay.io/fedora/coreos per https://fedoraproject.org/wiki/Changes/OstreeNativeContainer
-def quay_registry = "quay.io/coreos-assembler/fcos"
+def quay_registry = "quay.io/fedora/fedora-coreos"
+def old_quay_registry = "quay.io/coreos-assembler/fcos"
 
 // Get the list of requested architectures to release
 def basearches = params.ARCHES.split() as Set
@@ -177,15 +177,24 @@ podTemplate(cloud: 'openshift', label: pod_label, yaml: pod) {
 
         stage("Push OSContainer Manifest") {
             // Ship a manifest list containing all requested architectures.
-            withCredentials([file(credentialsId: 'oscontainer-secret', variable: 'OSCONTAINER_SECRET')]) {
+            withCredentials([file(credentialsId: 'oscontainer-secret', variable: 'REGISTRY_SECRET')]) {
                 def arch_args = basearches.collect{"--arch ${it}"}.join(" ")
                 shwrap("""
-                cosa push-container-manifest --auth=\${OSCONTAINER_SECRET} \
+                cosa push-container-manifest --auth=\${REGISTRY_SECRET} \
                     --repo=${quay_registry} --tag=${params.STREAM} \
                     --artifact=ostree --metajsonname=base-oscontainer \
                     --build=${params.VERSION} ${arch_args}
                 """)
             }
+            // For a period of time let's also mirror into the old location too
+            // Drop this after October 2022
+            withCredentials([file(credentialsId: 'old-oscontainer-secret', variable: 'REGISTRY_SECRET')]) {
+                shwrap("""
+                skopeo copy --all --authfile \$REGISTRY_SECRET \
+                    docker://${quay_registry}:${params.STREAM} \
+                    docker://${old_quay_registry}:${params.STREAM}
+                """)
+            }
         }
 
         stage('Publish') {