Skip to content

mantle: support Butane in platform/conf; use that rather than shelling out or hardcoding Ignition#2246

Merged
bgilbert merged 10 commits into
coreos:mainfrom
bgilbert:butane
Jun 24, 2021
Merged

mantle: support Butane in platform/conf; use that rather than shelling out or hardcoding Ignition#2246
bgilbert merged 10 commits into
coreos:mainfrom
bgilbert:butane

Conversation

@bgilbert
Copy link
Copy Markdown
Contributor

@bgilbert bgilbert commented Jun 23, 2021

Untested.

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Jun 23, 2021

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@bgilbert
Copy link
Copy Markdown
Contributor Author

/test all

@arithx
Copy link
Copy Markdown
Contributor

arithx commented Jun 23, 2021

Drop support for qemuexec --ignition-direct, which hopefully isn't needed now that everything is on spec 3.x.

Untested.

I used --ignition-direct when testing Ignition patches for new code in experimental versions (though there might be a better way for doing that).

@bgilbert
Copy link
Copy Markdown
Contributor Author

Okay, dropped the --ignition-direct commit. The cleanup that needed it didn't work out anyway, so no big deal.

@bgilbert
Copy link
Copy Markdown
Contributor Author

/test all

@darkmuggle
Copy link
Copy Markdown
Contributor

AFAIK, this is working well for the devshell cases:

  • LUKS w/ Tang and TPM
  • Console auto login
  • SSH keys and users

Tested using both RHCOS and FCOS.

@bgilbert bgilbert marked this pull request as ready for review June 24, 2021 00:23
@darkmuggle
Copy link
Copy Markdown
Contributor

From my POV, this looks fine -- the Golang looks good (looked it over twice). I'd put my perfunctory stamp, but would rather have @arithx take a look first.

@bgilbert
Copy link
Copy Markdown
Contributor Author

bgilbert commented Jun 24, 2021

@coreos/multi-arch This PR enables kola tests for boot disk RAID on aarch64 and ppc64le. Please let us know if something is broken.

Copy link
Copy Markdown
Contributor

@arithx arithx left a comment

Choose a reason for hiding this comment

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

Change LGTM overall.

Comment thread mantle/kola/harness.go
userdata = conf.Ignition(string(v))
} else if isreg && (c.Name() == "config.bu" || c.Name() == "config.fcc") {
b, err := exec.Command("fcct", fpath).Output()
v, err := ioutil.ReadFile(filepath.Join(dir, c.Name()))
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It's less exact but technically we could always group the Ignition & Butane/FCCT sections together and use conf.Unknown's detection logic no? Could maybe even loosen it to config* as the qualifier for a config object if we go that route.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yeah, I thought about that. Since we already have separate command-line options to distinguish the config types, I'm inclined to keep using those, rather than combining them and expecting the code to guess.

Copy link
Copy Markdown
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

Very nice! This also fixes #2035.

@bgilbert bgilbert linked an issue Jun 24, 2021 that may be closed by this pull request
@bgilbert bgilbert merged commit a7fd9b8 into coreos:main Jun 24, 2021
@bgilbert bgilbert deleted the butane branch June 24, 2021 21:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add support for providing Butane configs in native kola tests

4 participants