Merge branch maint-1.3 to main #2192
Merged
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
Signed-off-by: Armando Acosta <armando.acosta@oracle.com>
This change will cause automatic building of COPR builds after committing to `maint-1.3` branch. The `maint-1.3` branch isn't the project default branch. Without specifying the branch, Packit builds after committing only to the project's default branch, which is the `main` branch at this moment. The `maint-1.3` branch used to be default branch, but after we switched the default branch to main, the COPR builds on maint-1.3 stopped to be built. Related documentation: https://packit.dev/docs/configuration/upstream/copr_build
Build COPR builds for maint-1.3
The current configuration makes build Fedora builds on commit to the maint-1.3 branch. https://copr.fedorainfracloud.org/coprs/packit/OpenSCAP-openscap-maint-1.3/ But, we wanted to have CentOS Stream builds instead.
Request CentOS Stream builds explicitly
Update bug report link in openscap_api.py
The script is updated to first verify that it runs in a bootable container environment - `bootc` package must be installed and `/run/.containerenv` file must exist which indicates we are running inside a container. If it is not running inside a bootable container environment it informs user and exits. Another change is that installation of `openscap-engine-sce` package has been moved from specfile into the script as the script already installs other requirements which are needed by SCE checks from CaC/content.
After we added SCE checks to ComplianceAsCode data streams we discovered that the oscap info output is appalling because it's polluted by all the SCE check information. In this commit, we will address this problem by removing SCE checks from the "Referenced check files:" section. Then, we will completely remove the "Checks:" and "Dictionaries:" sections because they only list crefs and crefs are internal data stream identifiers that noone should be interested in.
…dencies Update oscap-bootc to verify it runs in bootable container env
Reduce oscap info output
This commit renames the `oscap-bootc` tool to `oscap-im`. IM stands for Image Mode. The `bootc` is just one of the tools that participate on the Image Mode Operating System experience, therefore, it's more appropriate to use Image Mode than bootc in the tooling naming. It should be safe to rename it now because the `oscap-bootc` hasn't been released in upstream nor in downstream.
Rename oscap-bootc to oscap-im
|
Hello @jan-cerny! Thanks for opening this PR. We checked the lines you've touched for PEP 8 issues, and found:
|
evgenyz
approved these changes
Jan 7, 2025
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.
This will bring the latest changes done in maint-1.3 branch to main branch, including the oscap-im tool updates.