fix: add missing build stages and fix ordering in EE template#586
Merged
NilashishC merged 1 commit intomainfrom Apr 28, 2026
Merged
fix: add missing build stages and fix ordering in EE template#586NilashishC merged 1 commit intomainfrom
NilashishC merged 1 commit intomainfrom
Conversation
Add the missing `append_galaxy`, `prepend_builder`, and `append_builder` stages to the execution-environment.yml.j2 template. Reorder all `additional_build_steps` blocks to follow the correct ansible-builder v3 build stage sequence: base → galaxy → builder → final.
6439617 to
7f7ed28
Compare
rockygeekz
approved these changes
Apr 28, 2026
rockygeekz
left a comment
There was a problem hiding this comment.
Review Summary
The fix correctly addresses the bug reported in AAP-73027, where 3 of 8 additional_build_steps stages were missing from the Jinja2 template.
What changed
- Added 3 missing stages:
append_galaxy,prepend_builder, andappend_builder— all three stages that were silently dropped during EE builds. - Fixed stage ordering: Moved
append_baseto its correct position (afterprepend_base, beforeprepend_galaxy). Previously it was rendered afterprepend_galaxy, which violated the ansible-builder v3 build stage sequence.
Verification
The resulting stage order in the template is now:
prepend_base → append_base → prepend_galaxy → append_galaxy → prepend_builder → append_builder → prepend_final → append_final
This matches the ansible-builder v3 specification which defines the build stage sequence as: base → galaxy → builder → final.
Notes
- The new stage blocks follow the same conditional pattern (
is definedguard +forloop) as existing stages — consistent and correct. - The
append_baseblock correctly preserves its special-case logic for non-official EEs (RUN $PYCMD -m pip install -U pip). - Existing test fixtures (
tests/fixtures/common/execution-environment/execution-environment.ymlandtests/fixtures/project/ee_project/execution-environment.yml) don't exercise the new stages, but since those fixtures test the default non-official EE path (which only generatesappend_base), they remain valid. Adding a fixture that exercises all 8 stages would be a nice follow-up but isn't blocking.
LGTM — clean, minimal fix that addresses the root cause.
rockygeekz
approved these changes
Apr 28, 2026
|
pre-commit.ci run |
1 similar comment
|
pre-commit.ci run |
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
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.
append_galaxy,prepend_builder, andappend_builderstages to the execution-environment.yml.j2 template.additional_build_stepsblocks to follow the correct ansible-builder v3 build stage sequence: base → galaxy → builder → final.Closes https://redhat.atlassian.net/browse/AAP-73027