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.

Sign up for GitHub

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

Jump to bottom

Fixes debian #12084

Merged
merged 4 commits into from
Aug 2, 2024
Merged

Fixes debian #12084

merged 4 commits into from
Aug 2, 2024

Conversation

a-skr
Copy link
Contributor

@a-skr a-skr commented Jun 20, 2024

Description:

  • update debian12 profiles
  • update a chronyd rule to handle debian /etc sub-directories organization.
  • fix a regex in sysctl template

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Jun 20, 2024

Hi @a-skr. Thanks for your PR.

I'm waiting for a ComplianceAsCode member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-ci openshift-ci bot added the needs-ok-to-test Used by openshift-ci bot. label Jun 20, 2024
@github-actions GitHub Actions
Copy link

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

rhel8 (from CTF) Environment (using Fedora as testing environment)
Open in Gitpod

Fedora Testing Environment
Open in Gitpod

Oracle Linux 8 Environment
Open in Gitpod

@a-skr a-skr mentioned this pull request Jun 20, 2024
Open
@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 20, 2024 •
edited
Loading

🤖 A k8s content image for this PR is available at:
ghcr.io/complianceascode/k8scontent:12084
This image was built from commit: ded9af2

Click here to see how to deploy it

If you alread have Compliance Operator deployed:
utils/build_ds_container.py -i ghcr.io/complianceascode/k8scontent:12084

Otherwise deploy the content and operator together by checking out ComplianceAsCode/compliance-operator and:
CONTENT_IMAGE=ghcr.io/complianceascode/k8scontent:12084 make deploy-local

jan-cerny
jan-cerny reviewed Jun 25, 2024
View reviewed changes
linux_os/guide/services/ntp/chronyd_specify_remote_server/oval/shared.xml Outdated
@@ -15,7 +15,7 @@

<ind:textfilecontent54_object comment="Ensure at least one NTP server is set"
id="object_chronyd_remote_server" version="1">
<ind:filepath operation="pattern match">^/etc/chrony\.(conf|d/.+\.conf)$</ind:filepath>
<ind:filepath operation="pattern match">^/etc/(?:chrony/)?chrony\.(conf|d/.+\.conf)$</ind:filepath>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be reworked to use product properties chrony_conf_path and chrony_d_path correctly.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

commit has been amended accordingly.

@marcusburghardt marcusburghardt added the Debian Debian product related. label Jul 1, 2024
@marcusburghardt marcusburghardt requested a review from a team July 1, 2024 07:12
@marcusburghardt marcusburghardt added this to the 0.1.74 milestone Jul 1, 2024
@dodys
Copy link
Contributor

dodys commented Jul 5, 2024

/packit build

jan-cerny
jan-cerny reviewed Jul 10, 2024
View reviewed changes
products/debian12/product.yml Outdated
Comment on lines 38 to 39
chrony_conf_path: "/etc/chrony/chrony.conf"
chrony_d_path: "/etc/chrony/chrony.d"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the CI fails because you will have to update the product stability data

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have updated the product stability data (and rebased onto current master).

@a-skr a-skr force-pushed the fixes-debian branch 2 times, most recently from eabac7d to 164b820 Compare July 16, 2024 07:38
@Mab879 Mab879 self-assigned this Jul 17, 2024
Mab879
Mab879 requested changes Jul 25, 2024
View reviewed changes
Copy link
Member

@Mab879 Mab879 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR, I have one comment.

linux_os/guide/services/ntp/chronyd_specify_remote_server/oval/shared.xml Outdated
@@ -15,7 +15,8 @@

<ind:textfilecontent54_object comment="Ensure at least one NTP server is set"
id="object_chronyd_remote_server" version="1">
<ind:filepath operation="pattern match">^/etc/chrony\.(conf|d/.+\.conf)$</ind:filepath>
<!-- ind:filepath operation="pattern match">^/etc/(?:chrony/)?chrony\.(conf|d/.+\.conf)$</ind:filepath -->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dead code should be deleted, we can recover it in git if needed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I did miss this message from two weeks ago. I just updated my branch.

@Mab879 Mab879 modified the milestones: 0.1.74, 0.1.75 Jul 29, 2024
@codeclimate CodeClimate
Copy link

codeclimate bot commented Aug 1, 2024

Code Climate has analyzed commit ded9af2 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 59.4% (0.0% change).

View more on Code Climate.

dodys
dodys approved these changes Aug 2, 2024
View reviewed changes
Copy link
Contributor

@dodys dodys left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, thanks!

@Mab879
Copy link
Member

Mab879 commented Aug 2, 2024

Automatus passes locally

$ ./automatus.py rule --datastream ../build/ssg-rhel9-ds.xml --remediate-using bash  --libvirt qemu:///system automatus_rhel9_4 chronyd_specify_remote_server 
Setting console output to log level INFO
INFO - The base image option has not been specified, choosing libvirt-based test environment.
INFO - Logging into /home/mburket/Developer/ComplianceAsCode/content/tests/logs/rule-custom-2024-08-02-1247/test_suite.log
INFO - xccdf_org.ssgproject.content_rule_chronyd_specify_remote_server
INFO - Script correct.pass.sh using profile (all) OK
INFO - Script correct_pool.pass.sh using profile (all) OK
INFO - Script file_empty.fail.sh using profile (all) OK
INFO - Script file_missing.fail.sh using profile (all) OK
INFO - Script line_missing.fail.sh using profile (all) OK
INFO - Script multiple_servers.pass.sh using profile (all) OK
INFO - Script server_not_specified.fail.sh using profile (all) OK

@Mab879 Mab879 merged commit 0c4f15e into ComplianceAsCode:master Aug 2, 2024
88 of 90 checks passed
@yuumasato yuumasato mentioned this pull request Aug 19, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jan-cerny jan-cerny jan-cerny left review comments

@Mab879 Mab879 Mab879 approved these changes

@dodys dodys dodys approved these changes

Assignees

@Mab879 Mab879

Labels
Debian Debian product related. needs-ok-to-test Used by openshift-ci bot.
Projects
None yet
Milestone
0.1.75
Development

Successfully merging this pull request may close these issues.
5 participants
@a-skr @dodys @Mab879 @jan-cerny @marcusburghardt