Skip to content

Move Ignition conversion into qemu API#1284

Merged
openshift-merge-robot merged 1 commit into
coreos:masterfrom
cgwalters:qemuexec-cleanup
Mar 26, 2020
Merged

Move Ignition conversion into qemu API#1284
openshift-merge-robot merged 1 commit into
coreos:masterfrom
cgwalters:qemuexec-cleanup

Conversation

@cgwalters
Copy link
Copy Markdown
Member

Since the lifetime of the temporary file we generate needs
to be bound to the qemu process, teach the qemu API to
take an Ignition config directly and do a conversion as necessary.

This drops all the now unnecessary conversion stuff from cmd-run.

Since the lifetime of the temporary file we generate needs
to be bound to the qemu process, teach the qemu API to
take an Ignition config directly and do a conversion as necessary.

This drops all the now unnecessary conversion stuff from `cmd-run`.
}

if kola.Options.IgnitionVersion == "" {
if kola.Options.IgnitionVersion == "" && kola.QEMUOptions.DiskImage == "" {
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It took me a while to debug why:

cosa run -d /path/to/rhcos-4.2.0.qcow2

was still getting spec3, it was because I was running from my /srv/walters/fcos builds directory...

I think in the future what we should do is basically synthesize a Build object if provided a --qemu-image and internally always reference that.

Comment thread mantle/platform/qemu.go
}

func (inst *QemuInstance) Destroy() {
if inst.tmpConfig != "" {
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also this should be using a memfd_create() or so in the future, need to research Go bindings for that.

@jlebon
Copy link
Copy Markdown
Member

jlebon commented Mar 25, 2020

/approve
Looks reasonable to me!

@jlebon
Copy link
Copy Markdown
Member

jlebon commented Mar 26, 2020

/lgtm

@openshift-ci-robot
Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, jlebon

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit e6e7163 into coreos:master Mar 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants