Fix thin data streams with SCE#12503
Merged
Merged
Conversation
Fixes broken build of thin data streams when SCE is enabled.
Addressing:
$ ADDITIONAL_CMAKE_OPTIONS=-DSSG_SCE_ENABLED=ON ./build_product rhel9 --thin
...
Traceback (most recent call last):
File "/home/jcerny/work/git/scap-security-guide/build-scripts/compose_ds.py", line 319, in <module>
_compose_multiple_ds(args)
File "/home/jcerny/work/git/scap-security-guide/build-scripts/compose_ds.py", line 303, in _compose_multiple_ds
ds = compose_ds(
^^^^^^^^^^^
File "/home/jcerny/work/git/scap-security-guide/build-scripts/compose_ds.py", line 263, in compose_ds
embed_sce_checks_in_datastream(ds_collection, checklists, sce_check_files, refdir)
File "/home/jcerny/work/git/scap-security-guide/build-scripts/compose_ds.py", line 41, in embed_sce_checks_in_datastream
with open(path, 'rt', encoding='utf8') as fd:
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
FileNotFoundError: [Errno 2] No such file or directory: '/home/jcerny/work/git/scap-security-guide/build/rhel9/thin_ds_components/rhel9/checks/sce/apparmor_configured.sh'
|
Start a new ephemeral environment with changes proposed in this pull request: Fedora Environment Oracle Linux 8 Environment |
|
Code Climate has analyzed commit f70ee66 and detected 0 issues on this pull request. The test coverage on the diff in this pull request is 100.0% (50% is the threshold). This pull request will bring the total coverage in the repository to 61.0% (0.0% change). View more on Code Climate. |
Mab879
approved these changes
Oct 16, 2024
Member
Mab879
left a comment
There was a problem hiding this comment.
Waving the automatus test as it isn't related to this PR.
Thanks!
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
2 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.
Description:
Fixes broken build of thin data streams when SCE is enabled.
Addressing:
Rationale:
Fixes a long standing bug in build system. This bug wasn't noticed but it would block us from enabling SCE by default. Therefore this PR blocks #12488.
Review Hints:
Run this before and after this change.
ssg-build-rhel9-ds.xmlcontains theextended-componentelements.extended-componentelement, eg.build/thin_ds/ssg-rhel9-ds_service_abrtd_disabled.xml.