fix(buildsys): include EIF artifacts in copy_guest_image_artifacts - #690
Merged
Merged
Conversation
rpm2eif produces three artifacts that use naming conventions
incompatible with the existing dot-suffix allowlist: {prefix}.eif,
{prefix}-disk.img, and {prefix}-kernel.
Without this fix, `copy_guest_image_artifacts` silently drops all
EIF outputs when embedding a guest variant into a host image, because
the find glob `*.${suffix}` never matches the hyphen-separated
names.
Add `eif` to IMAGE_ARTIFACT_SUFFIXES and introduce a new
IMAGE_ARTIFACT_GLOBS array for patterns that cannot be expressed as
dot-suffixes. Update guest-images-helper to iterate both arrays when
building the find command. Update shell and Rust integration tests to
cover the new artifact types.
Signed-off-by: Gavin Inglis <giinglis@amazon.com>
ginglis13
force-pushed
the
fix-eif-guest-copy
branch
from
July 27, 2026 21:42
4945804 to
1b853e2
Compare
sam-berning
approved these changes
Jul 27, 2026
Contributor
Author
|
Added testing details |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Issue number:
n/a
Description of changes:
rpm2eif produces three artifacts that use naming conventions
incompatible with the existing dot-suffix allowlist: {prefix}.eif,
{prefix}-disk.img, and {prefix}-kernel.
Without this fix,
copy_guest_image_artifactssilently drops allEIF outputs when embedding a guest variant into a host image, because
the find glob
*.${suffix}never matches the hyphen-separatednames.
Add
eifto IMAGE_ARTIFACT_SUFFIXES and introduce a newIMAGE_ARTIFACT_GLOBS array for patterns that cannot be expressed as
dot-suffixes. Update guest-images-helper to iterate both arrays when
building the find command. Update shell and Rust integration tests to
cover the new artifact types.
Testing done:
Built a variant with these changes,
image-format = "eif",standalone-image = true, and bottlerocket-os/bottlerocket-core-kit#944After building the host variant, extracted its EROFS root partition and checked the guest embed paths:
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.