Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion mantle/kola/tests/ignition/qemufailure.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/cmd-import
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading