Skip to content

Fix regression in grub2_bootloader_argument#11768

Merged
dodys merged 2 commits into
ComplianceAsCode:masterfrom
mpurg:ubuntu_fix_grub2_pt2
Apr 4, 2024
Merged

Fix regression in grub2_bootloader_argument#11768
dodys merged 2 commits into
ComplianceAsCode:masterfrom
mpurg:ubuntu_fix_grub2_pt2

Conversation

@mpurg
Copy link
Copy Markdown
Contributor

@mpurg mpurg commented Mar 28, 2024

Description:

Rationale:

  • The OVAL passed even if the grub2 argument was not defined in /etc/default/grub nor in /etc/default/grub.d/*cfg.
  • The fixed and correct behavior is to pass if it is defined in "at least one" configuration file.

@openshift-ci openshift-ci Bot added the needs-ok-to-test Used by openshift-ci bot. label Mar 28, 2024
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Mar 28, 2024

Hi @mpurg. 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.

Details

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/test-infra repository.

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Mar 28, 2024

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

Fedora Environment
Open in Gitpod

Oracle Linux 8 Environment
Open in Gitpod

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Mar 28, 2024 •
edited
Loading

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

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:11768

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

@dodys dodys requested a review from a team April 1, 2024 11:38
@dodys dodys self-assigned this Apr 1, 2024
@dodys dodys added ok-to-test Used by openshift-ci bot. and removed needs-ok-to-test Used by openshift-ci bot. labels Apr 1, 2024
@dodys
Copy link
Copy Markdown
Contributor

dodys commented Apr 1, 2024

/packit retest-failed

dodys
dodys approved these changes Apr 1, 2024
View reviewed changes
Copy link
Copy Markdown
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!

@dodys
Copy link
Copy Markdown
Contributor

dodys commented Apr 1, 2024

/packit retest-failed

@dodys
Copy link
Copy Markdown
Contributor

dodys commented Apr 1, 2024 •
edited
Loading

@Mab879 it seems this packit test that is failing is unrelated to the PR.
Is it possible to override it?

@Mab879
Copy link
Copy Markdown
Member

Mab879 commented Apr 3, 2024

@Mab879 it seems this packit test that is failing is unrelated to the PR. Is it possible to override it?

Agreed that test is unrelated.

A rebase might fix it and recent PRs are passing. I would rather do that then override the tests.

@dodys
Copy link
Copy Markdown
Contributor

dodys commented Apr 4, 2024

@mpurg could you please rebase it?

mpurg added 2 commits April 4, 2024 14:12
@mpurg
Add Ubuntu tests for grub2_bootloader_argument template
e742b68 
Tests did not adequately cover all the scenarios.
@mpurg
Fix for OVAL in grub2_bootloader_argument on Ubuntu
73028d1 
This fixes a regression introduced in commit 62dafb1.
The check passed even if the grub2 argument was not defined
in /etc/default/grub nor in /etc/default/grub.d/*cfg.

The correct behavior is to pass if it is defined in
at least one configuration file.
@mpurg mpurg force-pushed the ubuntu_fix_grub2_pt2 branch from 803c0ab to 73028d1 Compare April 4, 2024 12:12
@qlty-cloud-legacy
Copy link
Copy Markdown

qlty-cloud-legacy Bot commented Apr 4, 2024

Code Climate has analyzed commit 73028d1 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.3% (0.0% change).

View more on Code Climate.

@dodys
Copy link
Copy Markdown
Contributor

dodys commented Apr 4, 2024

/packit retest-failed

@dodys dodys merged commit fdd3013 into ComplianceAsCode:master Apr 4, 2024
@jan-cerny jan-cerny added this to the 0.1.73 milestone Apr 10, 2024
@jan-cerny jan-cerny added the OVAL OVAL update. Related to the systems assessments. label Apr 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dodys dodys dodys approved these changes

Assignees

@dodys dodys

Labels

ok-to-test Used by openshift-ci bot. OVAL OVAL update. Related to the systems assessments.

Projects

None yet

Milestone

0.1.73

Development

Successfully merging this pull request may close these issues.

4 participants

@mpurg @dodys @Mab879 @jan-cerny