Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bib: switch to use bootc install to-filesystem (HMS-3453) #342

Merged
merged 8 commits into from
Apr 17, 2024

Conversation

mvo5
Copy link
Collaborator

@mvo5 mvo5 commented Apr 10, 2024

[draft as this requires https://github.com/osbuild/images/pull/571 first]

This replaces #304 which did not implement customizations.
With this approach we keep the user customizations we had before (it does drop groups for now mostly because that seems less used and more risky).

@mvo5 mvo5 force-pushed the switch-to-bootc-install-to-fs-2 branch 2 times, most recently from ce93df7 to 4b7ff47 Compare April 12, 2024 11:42
@mvo5 mvo5 force-pushed the switch-to-bootc-install-to-fs-2 branch from 4b7ff47 to 5868205 Compare April 15, 2024 11:34
@mvo5 mvo5 marked this pull request as ready for review April 15, 2024 11:57
achilleas-k
achilleas-k previously approved these changes Apr 15, 2024
@mvo5
Copy link
Collaborator Author

mvo5 commented Apr 15, 2024

Hrm, hrm, this is ready now (including groups) except the cross arch building needs either:

Copy link
Contributor

@cgwalters cgwalters left a comment

Choose a reason for hiding this comment

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

We need to bind mount in the bootc container root (target root), not the bib root right?

@mvo5 mvo5 force-pushed the switch-to-bootc-install-to-fs-2 branch from f5142fc to aeef7e5 Compare April 16, 2024 14:32
@mvo5
Copy link
Collaborator Author

mvo5 commented Apr 16, 2024

We need to bind mount in the bootc container root (target root), not the bib root right?

Indeed, sorry that I overlooked this - I reverted this and opened osbuild/images#604 which allows us to make bib a frankenstein to build cross-arch. The bind mount idea is also (briefly) discussed there.

@mvo5
Copy link
Collaborator Author

mvo5 commented Apr 17, 2024

The tests are green now, we should probably still wait until #357 is landed to ensure we do not regress there (I think we will need osbuild/osbuild#1740 and osbuild/images#605). But getting really close - and so is the deadline :(

ondrejbudai
ondrejbudai previously approved these changes Apr 17, 2024
Copy link
Member

@ondrejbudai ondrejbudai left a comment

Choose a reason for hiding this comment

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

I love this! No concerns, let's get this in!

@achilleas-k achilleas-k added this pull request to the merge queue Apr 17, 2024
@ondrejbudai ondrejbudai removed this pull request from the merge queue due to a manual request Apr 17, 2024
@ondrejbudai
Copy link
Member

(let's wait for #357)

On casual reading `nexp` reads almost like a typo of `next` and
it's generally a bit short. Let's make it very explicit instead :)
This uses the new customization capabilites of the images
PR osbuild/images#571
And add a TODO about tweaking the tests in the future.
This is a temporary measure to be able to move to
`bootc install to-filesystem` by default. Only for cross arch
builds we use the "legacy" pipeline to build an bootc image.

This should be removed once either:

- containers/bootc#462
or
- https://www.mail-archive.com/[email protected]/msg1034508.html

are released in the relevant places (centos/rhel).
This includes osbuild/images#605 which
will ensure that bib sets the right `--target-imgref` on boot.
We are currently not testing that when the build image has a valid
`bootc status` that container the original container reference.
@mvo5 mvo5 force-pushed the switch-to-bootc-install-to-fs-2 branch from 26894e1 to e4936bf Compare April 17, 2024 15:51
@mvo5
Copy link
Collaborator Author

mvo5 commented Apr 17, 2024

I updated this now to include #360 and also the latest update in images which brings in osbuild/images#605 - with that and the "legacy" bootc workaround for the cross arch build this should finally be ready.

achilleas-k
achilleas-k previously approved these changes Apr 17, 2024
Copy link
Member

@achilleas-k achilleas-k left a comment

Choose a reason for hiding this comment

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

LGTM. Very exciting!!

... but the linter is unhappy.

@achilleas-k
Copy link
Member

Hm, the linter is being an idiot again. Let me dig into this a bit.

@achilleas-k
Copy link
Member

Ok, I think I fixed it. Probably.

The Go version in go.mod was updated to 1.20 in
cb78e83 but the linter was still on
1.19, which causes _weird_ issues like "unused imports" false positives.
@achilleas-k achilleas-k force-pushed the switch-to-bootc-install-to-fs-2 branch from 7a58516 to 6ee6ae9 Compare April 17, 2024 18:08
@achilleas-k
Copy link
Member

Of course, 1.20 in yaml is actually 1.2...

@mvo5 mvo5 added this pull request to the merge queue Apr 17, 2024
Merged via the queue into osbuild:main with commit 2041bbb Apr 17, 2024
9 checks passed
@mvo5 mvo5 deleted the switch-to-bootc-install-to-fs-2 branch April 18, 2024 05:22
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.

5 participants