From 7d3a8b6b48b725ea11cc790b818c637d0dd681b9 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 29 Aug 2025 14:54:30 -0400 Subject: [PATCH 1/2] cmd-import: use description label for summary The title and description labels are set to the same values but I think the leap from title->summary is greater than the leap from description->summary. Let's use description here. --- src/cmd-import | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd-import b/src/cmd-import index 0c16045be3..e06660c1fa 100755 --- a/src/cmd-import +++ b/src/cmd-import @@ -155,7 +155,7 @@ def generate_build_meta(tmp_oci_archive, tmp_oci_manifest, metadata, ostree_comm 'commit': commit, } - summary = metadata.get('Labels', {}).get('org.opencontainers.image.title') + summary = metadata.get('Labels', {}).get('org.opencontainers.image.description') if summary: meta['summary'] = summary From db063ac1beac76c26253415b3f5c1e5c4aa7917a Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 29 Aug 2025 14:34:15 -0400 Subject: [PATCH 2/2] mantle: detect when dumping to the virtio port failed This will help warn the user that the normal passing of information didn't work right so we can investigate it further. We were seeing this race condition in https://github.com/coreos/fedora-coreos-tracker/issues/2019 --- mantle/kola/tests/ignition/qemufailure.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/mantle/kola/tests/ignition/qemufailure.go b/mantle/kola/tests/ignition/qemufailure.go index d385c903d2..4bc9441bc6 100644 --- a/mantle/kola/tests/ignition/qemufailure.go +++ b/mantle/kola/tests/ignition/qemufailure.go @@ -133,7 +133,17 @@ func verifyError(builder *platform.QemuBuilder, searchPattern string) error { if err := inst.Kill(); err != nil { return errors.Wrapf(err, "failed to kill the vm instance") } - return errors.Wrapf(ctx.Err(), "timed out waiting for initramfs error") + // If somehow the journal dumping failed let's flag that. We + // just ignore errors here. This effort is only trying to help + // be more informative about why things failed. This "string" + // we are searching for comes from ignition-virtio-dump-journal + searchPattern = "Didn't find virtio port /dev/virtio-ports/com.coreos.ignition.journal" + found, _ := fileContainsPattern(builder.ConsoleFile, searchPattern) + if found { + return errors.Wrapf(ctx.Err(), "Journal dumping during emergency.target failed") + } else { + return errors.Wrapf(ctx.Err(), "timed out waiting for initramfs error") + } case err := <-errchan: if err != nil { return err