Repository navigation
tests/images with tailor [1]: tailor changes: fix image build arguments and signing - #842
Draft
bfjelds (bfjelds) wants to merge 3 commits into
Draft
bfjelds (bfjelds) wants to merge 3 commits into
bfjelds (bfjelds) wants to merge 3 commits into
Conversation
Fix several bugs in tailor discovered while validating signed and convert-based image builds: - stop emitting --image-cache-dir for Image Customizer convert and inject-files operations - restore fragment-level signing through render and build selection for signed VM image cells - fall back to pesign when sbsign is unavailable on Azure Linux hosts - bound leaf certificate common names to the X.509 64-character limit Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
Azure Pipelines: 1 pipeline(s) were filtered out due to trigger conditions. There may be pipelines that require an authorized user to comment /azp run to run. |
bfjelds (bfjelds)
changed the title
config: already resolved $include before merging each fragment's delta
(render_cell calls include::resolve_includes on fragment.doc.config), but
resolve_base merged each fragment's raw base: value directly, so a
base: { $include: ... } fragment hit merge.rs's generic "directive
$include ... must be resolved before merge" error - that generic message
exists precisely to catch an $include that should have already been
resolved by an earlier pass, and base: simply never had one.
Thread image_dir into resolve_base and call include::resolve_includes on
each fragment's base value before merging, mirroring config:'s handling
exactly. This lets a by-<axis>/<value>.yaml fragment's base: override
point at a shared snippet instead of repeating the same $set inline in
every family that needs the same base override - useful when several
otherwise-unrelated images share an identical by-arch (or similar)
fragment.
Added a regression test exercising two by-arch fragments that each
$include a different shared base snippet, confirming both resolve to the
expected path base per cell.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
bfjelds (bfjelds)
added a commit
that referenced
this pull request
Oct 10, 2026
Now that tools/tailor resolves $include under base: before merge (previous commit, PR #842), the four identical by-arch/arm64.yaml fragments (azurelinux-direct-streaming-testimage, trident-installer, trident-testimage, trident-vm-testimage) can point at one shared common/matrix/base-core-arm64.yaml snippet instead of repeating `base: { $set: { ref: core_arm64 } }` verbatim in each family. Verified: `tailor validate` (same 30 cells as before), and a dry-run/render of an arm64 cell confirming the rendered Image Customizer invocation still resolves --image-file to artifacts/core_arm64.vhdx and --platform to linux/arm64 exactly as before this change. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This branch has not been deployed
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
1 participant
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.
Summary
outputs[].namesupport to tailor config/runtimeoutputs[].namethrough renderValidation
cargo test --manifest-path tools/tailor/Cargo.toml -p tailor-configcargo test --manifest-path tools/tailor/Cargo.toml -p tailor-corecargo test --manifest-path tools/tailor/Cargo.toml -p tailor