release: allow pushing container images to multipes repositories

jbtrystram · jbtrystram · commit 2035d970af8a · 2025-02-17T14:34:28.000+01:00
In RHCOS we need to publish the oscontainer image to the release
repo and also the CI repo. Changing the registry_repo object to be an
array instead of a map to allow multiple entries.
diff --git a/config.yaml b/config.yaml
@@ -40,11 +40,11 @@ s3:
 
 registry_repos:
   oscontainer:
-    repo: quay.io/fedora/fedora-coreos
-    tags: ["${STREAM}", "${VERSION}"]
+    - repo: quay.io/fedora/fedora-coreos
+      tags: ["${STREAM}", "${VERSION}"]
   kubevirt:
-    repo: quay.io/fedora/fedora-coreos-kubevirt
-    tags: ["${STREAM}"]
+    - repo: quay.io/fedora/fedora-coreos-kubevirt
+      tags: ["${STREAM}"]
 
 default_artifacts:
   all:
diff --git a/docs/config.yaml b/docs/config.yaml
@@ -81,6 +81,12 @@ streams:
       # OPTIONAL: override additional architectures to build for
       additional_arches:
         - s390x
+      # OPTIONAL: add OCI registries to upload images to, specific to this stream.
+      # This will be merged with the `registry_repos` key.
+      additional_registry_repos:
+        oscontainer:
+          - repo: quay.io/someorg/someimage
+            tags: ["${STREAM}"] 
     rawhide:
       type: mechanical
       # OPTIONAL: additional architectures to skip building for
@@ -138,25 +144,29 @@ brew:
 registry_repos:
   # OPTIONAL: repo and tags to which to push oscontainer
   oscontainer:
-    # REQUIRED: repo name
-    repo: quay.io/fedora/fedora-coreos
-    # REQUIRED: list of tags to create/overwrite when pushing
-    #           STREAM and VERSION are supported for templating
-    tags: ["${STREAM}"]
-  # OPTIONAL: repo and tags to which to push legacy oscontainer
+      # REQUIRED: repo name
+    - repo: quay.io/fedora/fedora-coreos
+      # REQUIRED: list of tags to create/overwrite when pushing
+      #           STREAM and VERSION are supported for templating
+      tags: ["${STREAM}"]
+      # multiple push destinations can be specified
+    - repo: quay.io/some_other/registry
+      tags: ["{$STREAM}"]
+   # OPTIONAL: repo and tags to which to push legacy oscontainer
   legacy_oscontainer:
-    repo: quay.io/openshift-release-dev/rhel-coreos-dev
-    tags: ["${STREAM}-legacy", "${VERSION}-legacy"]
+    - repo: quay.io/openshift-release-dev/rhel-coreos-dev
+      tags: ["${STREAM}-legacy", "${VERSION}-legacy"]
   # OPTIONAL: repo and tags to which to push the extensions container
   extensions:
-    repo: quay.io/openshift-release-dev/rhel-coreos-extensions-dev
-    tags: ["${STREAM}-extensions", "${VERSION}-extensions"]
+    - repo: quay.io/openshift-release-dev/rhel-coreos-extensions-dev
+      tags: ["${STREAM}-extensions", "${VERSION}-extensions"]
   # OPTIONAL: repo and tags to which to push kubevirt containerdisk container
   kubevirt:
-    repo: quay.io/fedora/fedora-coreos-kubevirt
-    tags: ["${STREAM}"]
-  # OPTIONAL: whether to push in v2s2 format rather than OCI
-  v2s2: true
+    - repo: quay.io/fedora/fedora-coreos-kubevirt
+      tags: ["${STREAM}"]
+      # OPTIONAL: whether to push in v2s2 format rather than OCI
+      # Default to false if not specified
+      v2s2: true
 
 # OPTIONAL: cloud-related knobs
 clouds:
diff --git a/jobs/release.Jenkinsfile b/jobs/release.Jenkinsfile
@@ -259,26 +259,28 @@ lock(resource: "release-${params.STREAM}", extra: locks) {
         if (push_containers) {
             stage("Push Containers") {
                 parallel push_containers.collectEntries{configname, val -> [configname, {
-                    if (!registry_repos?."${configname}"?.'repo') {
+                    if (!registry_repos?."${configname}") {
                         echo "No registry repo config for ${configname}. Skipping"
                         return
                     }
                     withCredentials([file(variable: 'REGISTRY_SECRET',
                                           credentialsId: 'oscontainer-push-registry-secret')]) {
-                        def repo = registry_repos[configname]['repo']
+                        def repos = registry_repos[configname]
                         def (artifact, metajsonname) = val
-                        def tag_args = registry_repos[configname].tags.collect{"--tag=$it"}
-                        def v2s2_arg = registry_repos.v2s2 ? "--v2s2" : ""
-                        shwrap("""
-                        export COSA_SUPERMIN_MEMORY=1024 # this really shouldn't require much RAM
-                        cp \${REGISTRY_SECRET} tmp/push-secret-${metajsonname}
-                        cosa supermin-run /usr/lib/coreos-assembler/cmd-push-container-manifest \
-                            --auth=tmp/push-secret-${metajsonname} \
-                            --repo=${repo} ${tag_args.join(' ')} \
-                            --artifact=${artifact} --metajsonname=${metajsonname} \
-                            --build=${params.VERSION} ${v2s2_arg}
-                        rm tmp/push-secret-${metajsonname}
-                        """)
+                        for (repo in repos) {
+                            def tag_args = repo.tags.collect{"--tag=$it"}
+                            def v2s2_arg = repo.v2s2 ? "--v2s2" : ""
+                            shwrap("""
+                            export COSA_SUPERMIN_MEMORY=1024 # this really shouldn't require much RAM
+                            cp \${REGISTRY_SECRET} tmp/push-secret-${metajsonname}
+                            cosa supermin-run /usr/lib/coreos-assembler/cmd-push-container-manifest \
+                                --auth=tmp/push-secret-${metajsonname} \
+                                --repo=${repo.repo} ${tag_args.join(' ')} \
+                                --artifact=${artifact} --metajsonname=${metajsonname} \
+                                --build=${params.VERSION} ${v2s2_arg}
+                            rm tmp/push-secret-${metajsonname}
+                            """)
+                        }
                     }
                 }]}
             }
diff --git a/utils.groovy b/utils.groovy
@@ -516,26 +516,29 @@ def build_artifacts(pipecfg, stream, basearch) {
 
 def get_registry_repos(pipecfg, stream, version) {
     def registry_repos = pipecfg.registry_repos ?: [:]
-    // merge top-level registry_repos with stream-specific bits
-    registry_repos += pipecfg.streams[stream].additional_registry_repos ?: [:]
-    for (repo in (registry_repos.keySet() as List)) {
-        if (repo == 'v2s2') {
-            // this is a boolean option, not a registry repo
-            continue
-        }
-        if (registry_repos[repo].tags) {
-            def processed_tags = []
-            for (tag in registry_repos."${repo}".tags) {
-                tag = utils.substituteStr(tag, [STREAM: stream, VERSION: version])
-                if (pipecfg.hotfix) {
-                    // this is a hotfix build; include the hotfix name
-                    // in the tag suffix so we don't clobber official
-                    // tags
-                    tag += "-hotfix-${pipecfg.hotfix.name}"
+    // get stream-specific bits additional repos
+    def additional_repos = pipecfg.streams[stream].additional_registry_repos ?: [:]
+    for (repo_id in (additional_repos.keySet() as List)) {
+        // merge top-level registry_repos with additional repos
+        def merged_registry_repos = registry_repos[repo_id] ?: []
+        registry_repos[repo_id] = merged_registry_repos + (additional_repos[repo_id] ?: [])
+     }
+    for (repo_id in (registry_repos.keySet() as List)) {
+        for (repo in registry_repos[repo_id]) {
+            if (repo.tags) {
+                def processed_tags = []
+                for (tag in repo.tags) {
+                    tag = utils.substituteStr(tag, [STREAM: stream, VERSION: version])
+                    if (pipecfg.hotfix) {
+                        // this is a hotfix build; include the hotfix name
+                        // in the tag suffix so we don't clobber official
+                        // tags
+                        tag += "-hotfix-${pipecfg.hotfix.name}"
+                    }
+                    processed_tags += tag
                 }
-                processed_tags += tag
+                repo.tags = processed_tags
             }
-            registry_repos[repo]['tags'] = processed_tags
         }
     }
     return registry_repos
