osbuild: support metal4k; add aleph file stage #3675
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dustymabe
force-pushed
the
dusty-osbuild
branch
2 times, most recently
from
45fb894 to
541aad7
Compare
jlebon
previously approved these changes
Dec 4, 2023
These are the patches from upstream PR: Upstream osbuild/osbuild#1461 This commit also reworks a bit the patch_osbuild() function to make it easier for us to apply patches from git in the future. In git the code is all in the git repo whereas on a system the files are in various directories under /usr, so the patches pulled from git are hard to apply unless you do some musical chairs.
With osbuild/osbuild@e191dc1 we can now drop specifying `id` and just specify `name`, which `id` will inherit the value of.
This will allow us in the future to define and use more than one disk image layout. Builds on top of osbuild/osbuild@2e1f6e2
This is a set of patches from a currently a WIP PR from upstream in osbuild/osbuild#1475
In the osbuild aleph file work we decided to use `version:` instead of `build:` here because our COSA build ID isn't exactly ties to the version of the ostree commit and is essentially a COSA concept. While we transition to osbuild let's just add a version field here too in COSA and lazily set it to buildid, even if it's not 100% accurate. Also, fix a test that checks the `.build` field from .coreos-aleph-version.json
We do this in create_disk today so let's set it in our coreos.osbuild.mpp.yaml manifest too.
dustymabe
force-pushed
the
dusty-osbuild
branch
from
541aad7 to
ff779bd
Compare
|
rebased! |
jlebon
approved these changes
Dec 4, 2023
|
@dustymabe: The following test failed, say
Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
|
hmm. the CI failure shows: But this should have nothing to do with that test. |
I'll skip. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
and a few other misc items: