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

test: tweak gen-images() to be smarter about the UUID hacks #212

Merged
merged 4 commits into from
Sep 26, 2024

Conversation

mvo5
Copy link
Contributor

@mvo5 mvo5 commented Sep 23, 2024

This commit tweaks the gen-images-ref to be slightly smarter
about how to handle UUIDs. Instead of the extremly naive table
of uuids generated by "images" and "gen-partition-table" it now
tries to figure out the UUID from images via the "mkfs" stage
of the manifest. This is also a bit (f)ugly but avoids some
busywork.

Hopefully we find a better way but this should give us some
time.

@achilleas-k
Copy link
Member

Would it be a lot of work to instead iterate through mkfs stages?

@mvo5 mvo5 force-pushed the hacky-gen-images-uuid-smartz branch 2 times, most recently from 3b48164 to 5dc0d5f Compare September 23, 2024 14:12
@mvo5 mvo5 force-pushed the hacky-gen-images-uuid-smartz branch from 5dc0d5f to bea0b83 Compare September 23, 2024 14:16
@mvo5
Copy link
Contributor Author

mvo5 commented Sep 23, 2024

We will also need to revert 48c9889 here if/after #209 gets merged (see #209 (review))

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.

#209 merged. Let's revert here.

supakeen
supakeen previously approved these changes Sep 26, 2024
@mvo5
Copy link
Contributor Author

mvo5 commented Sep 26, 2024

#209 merged. Let's revert here.

The revert from #209 is part of this PR now

This reverts commit b87cba3.
This commit tweaks the gen-images-ref to be slightly smarter
about how to handle UUIDs. Instead of the extremly naive table
of uuids generated by "images" and "gen-partition-table" it now
tries to figure out the UUID from images via the "mkfs" stage
of the manifest. This is also a bit (f)ugly but avoids some
busywork.

Hopefully we find a better way but this should give us some
time.
The new `gen-images` will create predictable UUIDs now but the
`centos_9-aarch64-qcow2-empty` reference was build without it
so this commit re-generates it.
achilleas-k
achilleas-k previously approved these changes Sep 26, 2024
@achilleas-k
Copy link
Member

Test manifests need updating

The new `gen-images` will create predictable UUIDs now but the
`centos_9-aarch64-ami-empty` reference was build without it
so this commit re-generates it.
@mvo5 mvo5 dismissed stale reviews from achilleas-k and supakeen via 9a64af4 September 26, 2024 10:49
@mvo5 mvo5 force-pushed the hacky-gen-images-uuid-smartz branch from 228070e to 9a64af4 Compare September 26, 2024 10:49
@supakeen supakeen added this pull request to the merge queue Sep 26, 2024
Merged via the queue into osbuild:main with commit 2463edf Sep 26, 2024
3 checks passed
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.

3 participants