Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid sed hack #9363

Merged
merged 1 commit into from
Sep 14, 2022
Merged

Avoid sed hack #9363

merged 1 commit into from
Sep 14, 2022

Conversation

jan-cerny
Copy link
Collaborator

@jan-cerny jan-cerny commented Aug 17, 2022

Instead of modifying the generated XCCDF file by using sed command, we
can directly generate an XCCDF file containing the correct strings from
the beginning. To do that, we need to rename the interim internal build
artifacts (oval-linked.xml and ocil-linked.xml). However, it will help
us streamline our build process in future.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Used by openshift-ci bot. label Aug 17, 2022
@openshift-ci
Copy link

openshift-ci bot commented Aug 17, 2022

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@jan-cerny jan-cerny added Infrastructure Our content build system and removed do-not-merge/work-in-progress Used by openshift-ci bot. labels Aug 17, 2022
@github-actions
Copy link

Start a new ephemeral environment with changes proposed in this pull request:

Fedora Environment
Open in Gitpod

Oracle Linux 8 Environment
Open in Gitpod

@marcusburghardt marcusburghardt added the enhancement General enhancements to the project. label Aug 19, 2022
@openshift-merge-robot openshift-merge-robot added the needs-rebase Used by openshift-ci bot. label Aug 25, 2022
Instead of modifying the generated XCCDF file by using sed command, we
can directly generate an XCCDF file containing the correct strings from
the beginning. To do that, we need to rename the interim internal build
artifacts (oval-linked.xml and ocil-linked.xml). However, it will help
us streamline our build process in future.
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Used by openshift-ci bot. label Sep 1, 2022
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Used by openshift-ci bot. label Sep 1, 2022
@codeclimate
Copy link

codeclimate bot commented Sep 1, 2022

Code Climate has analyzed commit 2c97113 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 42.3% (0.0% change).

View more on Code Climate.

@jan-cerny jan-cerny marked this pull request as ready for review September 1, 2022 14:10
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Used by openshift-ci bot. label Sep 1, 2022
@jan-cerny
Copy link
Collaborator Author

I have rebased the PR on the top of the latest upstream master branch.

@matejak matejak self-assigned this Sep 7, 2022
@matejak matejak added this to the 0.1.64 milestone Sep 7, 2022
@matejak
Copy link
Member

matejak commented Sep 14, 2022

The only disadvantage is that the output of the ssg_build_xccdf_final step overwrites its input. But as the plan is to get rid of XSLTs anyway, it is just a temporal problem, and we already do overwrites in the build system already, so it is not entirely unexpected.
Thank you for the PR!

@matejak
Copy link
Member

matejak commented Sep 14, 2022

Test failures are unrealted to the PR, there are just a couple of STIG rules that can't be hardened.

@matejak matejak merged commit 78a5df5 into ComplianceAsCode:master Sep 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement General enhancements to the project. Infrastructure Our content build system XCCDF12
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants