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 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