From 0d430c9d084e890989ce7fe8d0ba7dc50c09da54 Mon Sep 17 00:00:00 2001
From: Zack Zlotnik <zzlotnik@redhat.com>
Date: Tue, 18 Jan 2022 16:40:10 -0500
Subject: [PATCH] wrap skopeo push in withCredentials block

---
 Jenkinsfile.release | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile.release b/Jenkinsfile.release
index d565bc87a..769767dc4 100644
--- a/Jenkinsfile.release
+++ b/Jenkinsfile.release
@@ -90,15 +90,14 @@ podTemplate(cloud: 'openshift', label: pod_label, yaml: pod) {
             """)
         }
 
-        def oscontainer_secret = "/run/kubernetes/secrets/oscontainer-registry/dockercfg";
-        if (utils.pathExists(oscontainer_secret)) {
         stage('Sync oscontainer to quay.io') {
-            shwrap("""ociarchive=\$(cosa meta --image-path ostree)
-                    case \${ociarchive} in
-                      *ociarchive) skopeo copy --authfile=$oscontainer_secret oci-archive://\${ociarchive} docker://quay.io/cgwalters/fcos:${params.STREAM};;
-                      *) echo Build not configured as oci ;;
-                    esac""")
-        }
+            withCredentials([string(credentialsId: "oscontainer-secret", variable: "OSCONTAINER_SECRET")]) {
+                shwrap("""ociarchive=\$(cosa meta --image-path ostree)
+                        case \${ociarchive} in
+                        *ociarchive) skopeo copy --authfile=<($OSCONTAINER_SECRET) oci-archive://\${ociarchive} docker://quay.io/coreos-assembler/fcos:${params.STREAM};;
+                        *) echo Build not configured as oci ;;
+                        esac""")
+            }
         }
 
         for (basearch in params.ARCHES.split()) {