release: allow pushing container images to multipes repositories

[jbtrystram]

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.

Patch best reviwed without whitespace changes

[jlebon]

Some comments, but approach LGTM overall!

This changes the schema, so we'll need to make sure to have the changes for the RHCOS pipecfg as well lined up so they merge at the same time.

[jlebon]

Does isEmpty() work if the $configname key is missing?

[jbtrystram]

if I understand correctly, if $configname is missing the ? will short circuit the expression

[jbtrystram]

Did some testing and haven't had issues. However I see what you mean : it would not exit and fail afterwards I suppose.
WDYT of if (!registry_repos?."${configname}") { as empty collections evaluate to false.
I tested that and it works as expected (see below comment)

[jbtrystram]

Thanks @dustymabe @jlebon for the review comments. I addressed those.
I'll do some testing on the devel pipeline today

This changes the schema, so we'll need to make sure to have the changes for the RHCOS pipecfg as well lined up so they merge at the same time.

Yep, The PR over there is ready. I added the hold label just in case.

[dustymabe]

LGTM

[jlebon]

This is now blocked on https://issues.redhat.com/browse/DPTP-4328.

[jbtrystram]

This is now blocked on https://issues.redhat.com/browse/DPTP-4328.

Is it ? The RHCOS change is, yes, but we can test this change before adding the extra repository in the RHCOS config

[jlebon]

This is now blocked on issues.redhat.com/browse/DPTP-4328.

Is it ? The RHCOS change is, yes, but we can test this change before adding the extra repository in the RHCOS config

Yes, that's fine assuming we remove that part of the pipecfg PR.

[jbtrystram]

Allright, I did some testing on the staging FCOS pipeline to iron out the small details :)

With the following patch, this is the result :

diff --git a/jobs/release.Jenkinsfile b/jobs/release.Jenkinsfile
index 7a45c6e6..a120327c 100644
--- a/jobs/release.Jenkinsfile
+++ b/jobs/release.Jenkinsfile
@@ -270,16 +270,17 @@ lock(resource: "release-${params.STREAM}", extra: locks) {
                         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}
-                            """)
+                            println "Would push to ${repo.repo} with tags ${tag_args.join(' ')}"
                         }
                     }
                 }]}

Result:

[2025-02-17T13:35:43.478Z] Would push to quay.io/jbtrystram/fcos with tags --tag=rawhide --tag=test
[2025-02-17T13:35:43.500Z] Would push to quay.io/jbtrystram/someotherrepo with tags --tag=sometag

Using the following config :

  rawhide:
    type: mechanical
    env:
      COSA_TESTISO_DEBUG: true
      RUNVM_CACHE_SIZE: "30G"
    osbuild_experimental: true
    additional_registry_repos:
      oscontainer:
        - repo: quay.io/jbtrystram/fcos
          tags: ["rawhide", "test"]
        - repo: quay.io/jbtrystram/someotherrepo
          tags: ["sometag"]

[jlebon]

LGTM! Will merge when ready to merge the pipecfg one.