From e7f19ff37956ec72b56489a2d2392e135f8a4c5f Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Thu, 28 Aug 2025 22:33:18 -0400 Subject: [PATCH 1/2] cmd-import: proxy org.opencontainers.image.title to summary in meta.json This is used by some code in this codebase. Notably some cloud uploads and e.g. our OVAs. Closes: https://github.com/coreos/fedora-coreos-tracker/issues/2017 --- src/cmd-import | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cmd-import b/src/cmd-import index ee2b16817b..0c16045be3 100755 --- a/src/cmd-import +++ b/src/cmd-import @@ -155,6 +155,10 @@ def generate_build_meta(tmp_oci_archive, tmp_oci_manifest, metadata, ostree_comm 'commit': commit, } + summary = metadata.get('Labels', {}).get('org.opencontainers.image.title') + if summary: + meta['summary'] = summary + # add a reference to ourselves as well try: with open('/cosa/coreos-assembler-git.json') as f: From 6a498a9e3adab4f183aba23a74ecd84b8ae4cd84 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Thu, 28 Aug 2025 22:37:04 -0400 Subject: [PATCH 2/2] cmd-list: don't require `dirty` field in coreos.assembler.container-config-git The field is optional in the schema and it's not populated in the buildah path. Just assume it's not dirty if it's missing. --- src/cmd-list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd-list b/src/cmd-list index c1d0b88914..c535381552 100755 --- a/src/cmd-list +++ b/src/cmd-list @@ -38,7 +38,7 @@ def main(): config = git['commit'] if 'branch' in git: config = f"{git['branch']} ({config[:12]})" - if git['dirty'] != "false": + if git.get('dirty', 'false') != "false": config += " (dirty)" print(f" Config: {config}") if build['id'] in tags: