Backport CRAYSAT-1917: Fix jinja2 rendering of boot_sets data in sat bootprep #285
+176
−58
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
Make the following fixes: - Remove the `boot_set` property from `BaseInputItem`. It is not appropriate there, and it is redundant with `boot_sets` property that already exists in the `InputSessionTemplate` - Modify the `jinja_rendered` decorator to recursively render more complex objects like lists and dictionaries. I think this is safe, but we should consider any edge cases more carefully. - Remove the now unnecessary code that does a one-off Jinja2 rendering of `rootfs_provider_passthrough` in the `boot_sets`. Could still use unit test enhancements that test this new ability to render fields in the boot_sets. Test Description: Tested on a simple bootprep input file that used a variable in the `rootfs_provider_passthrough` field of a boot set in a BOS session template. (cherry picked from commit 71ef427)
Add unit tests for usage of the `jinja_rendered` decorator on properties of the `BaseInputItem`. Modify these unit tests to simplify them slightly and to ensure that the `SomeTestItem` class calls the `BaseInputItem` constructor, so that it sets the `jinja_env` instance attribute, which is used by the `jinja_rendered` decorator. Test Description: Unit tests pass. (cherry picked from commit 6e42a20)
Update the unit tests of the InputSessionTemplate class to include tests that check for proper Jinja2 template rendering of the boot_sets field. (cherry picked from commit 8ff2874)
annapoorna-s-alt
requested review from
haasken-hpe,
ethanholen-hpe and
vinanti-p
haasken-hpe
approved these changes
Nov 12, 2024
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.
Summary and Scope
Backport sat-container image to 3.32.10
Issues and Related PRs
List and characterize relationship to Jira/Github issues and other pull requests. Be sure to list dependencies.
Testing
See the linked PR.
Risks and Mitigations
See the linked PR
Pull Request Checklist