Skip to content

Add new product for Ubuntu 26.04 and a default profile#14721

Merged
jan-cerny merged 6 commits into
ComplianceAsCode:masterfrom
WolfAnto:ubuntu2604
Jun 11, 2026
Merged

Add new product for Ubuntu 26.04 and a default profile#14721
jan-cerny merged 6 commits into
ComplianceAsCode:masterfrom
WolfAnto:ubuntu2604

Conversation

@WolfAnto

Copy link
Copy Markdown
Contributor

Description

  • New product for Ubuntu 26.04 based on Ubuntu 26.04
  • Minimal default profile for Ubuntu 26.04

I haven’t implemented the CIS profiles yet, because Ubuntu 26.04 was just released and the CIS hasn’t published a benchmark for creating one yet.

This pull request should therefore be seen as preparation for future CIS profiles or the STIG profile, while also giving some users the ability to create their own custom profiles.

@openshift-ci openshift-ci Bot added the needs-ok-to-test Used by openshift-ci bot. label May 19, 2026
@openshift-ci

openshift-ci Bot commented May 19, 2026

Copy link
Copy Markdown

Hi @WolfAnto. 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-sigs/prow repository.

@github-actions

Copy link
Copy Markdown

This datastream diff is auto generated by the check Compare DS/Generate Diff

Click here to see the full diff
OVAL for rule 'xccdf_org.ssgproject.content_rule_installed_OS_is_vendor_supported' differs.
--- oval:ssg-installed_OS_is_vendor_supported:def:1
+++ oval:ssg-installed_OS_is_vendor_supported:def:1
@@ -14,3 +14,4 @@
 extend_definition oval:ssg-installed_OS_is_slmicro6:def:1
 extend_definition oval:ssg-installed_OS_is_ubuntu2204:def:1
 extend_definition oval:ssg-installed_OS_is_ubuntu2404:def:1
+extend_definition oval:ssg-installed_OS_is_ubuntu2604:def:1

@mpurg mpurg added this to the 0.1.82 milestone May 20, 2026
@mpurg mpurg added Ubuntu Ubuntu product related. New Product Issues or pull requests related to new Products. labels May 20, 2026
@mpurg

mpurg commented May 20, 2026

Copy link
Copy Markdown
Contributor

/ok-to-test

@openshift-ci openshift-ci Bot added ok-to-test Used by openshift-ci bot. and removed needs-ok-to-test Used by openshift-ci bot. labels May 20, 2026
@mpurg mpurg removed the ok-to-test Used by openshift-ci bot. label May 20, 2026

@mpurg mpurg left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for contributing, looks good to me!

@mpurg mpurg added the needs-ok-to-test Used by openshift-ci bot. label May 20, 2026
@openshift-ci

openshift-ci Bot commented May 20, 2026

Copy link
Copy Markdown

@WolfAnto: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-openshift-platform-compliance e7f5763 link true /test e2e-aws-openshift-platform-compliance
ci/prow/e2e-aws-openshift-node-compliance e7f5763 link true /test e2e-aws-openshift-node-compliance

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

run: ssh-keygen -N '' -t rsa -f ~/.ssh/id_rsa
- name: Build test suite container
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
run: podman build --build-arg "CLIENT_PUBLIC_KEY=$(cat ~/.ssh/id_rsa.pub)" -t ssg_test_suite -f test_suite-ubuntu2604

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

The test_suite-ubuntu2604 Dockerfile doesn't exist.

Comment thread CODEOWNERS Outdated
/controls/cis_sle15.yml @ComplianceAsCode/suse-maintainers
/controls/stig_slemicro5.yml @ComplianceAsCode/suse-maintainers
/controls/cis_ubuntu2404.yml @ComplianceAsCode/ubuntu-maintainers
/controls/cis_ubuntu2604.yml @ComplianceAsCode/ubuntu-maintainers No newline at end of file

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This file doesn't exist.

@jan-cerny

Copy link
Copy Markdown
Collaborator

@WolfAnto Please fix the references to non-existent files by either removing the references or adding the referenced files to the PR.

The file does not yet exist and does not belong in CODEOWNERS
@WolfAnto

WolfAnto commented Jun 2, 2026

Copy link
Copy Markdown
Contributor Author

@jan-cerny Okay, it's been removed from the CODEOWNERS file.

@jan-cerny

Copy link
Copy Markdown
Collaborator

I can see that the reference to the non-existent control files has been removed from CODEOWNERS. But, the reference to the non-existent Dockerfile is still present in the .github/workflows/automatus-ubuntu2604.yml.

@WolfAnto

WolfAnto commented Jun 4, 2026

Copy link
Copy Markdown
Contributor Author

Sorry, I forgot to create it, but it's done now. 60adb94

Everything should be fine now @jan-cerny

Comment thread .github/workflows/automatus-ubuntu2604.yml Outdated
Comment thread .github/workflows/gate.yaml Outdated
Co-authored-by: Jan Černý <jcerny@redhat.com>
@WolfAnto

Copy link
Copy Markdown
Contributor Author

@jan-cerny
The Ubuntu 26.04 image should be arriving soon. It’s been in the works since April, so I imagine it will be available in the coming days or weeks. See Add Ubuntu 26.04 LTS (Resolute Raccoon) #13964

We’ll have to see whether it’s necessary to switch back to ubuntu-26.04 when it becomes available or stick with ubuntu-latest.

@jan-cerny

Copy link
Copy Markdown
Collaborator

@WolfAnto Thanks for the update. The "Build, Test" job has run and completed successfully. But, the "Automatus Ubuntu 26.04" job failed on the Dockerfile. It seems that the Dockerfile in this PR is misplaced - it's in the different directory than the configuration expects. Can you fix this?

Run podman build --build-arg "CLIENT_PUBLIC_KEY=$(cat ~/.ssh/id_rsa.pub)" -t ssg_test_suite -f test_suite-ubuntu2604
Error: the specified Containerfile or Dockerfile does not exist, /home/runner/work/content/content/Dockerfiles/test_suite-ubuntu2604: no such file or directory

@WolfAnto

Copy link
Copy Markdown
Contributor Author

@jan-cerny that was a slip-up on my part when I created the file. I've moved it to the right place.

Comment thread Dockerfiles/test_suite-ubuntu2604 Outdated
Co-authored-by: Jan Černý <jcerny@redhat.com>
@WolfAnto

Copy link
Copy Markdown
Contributor Author

@jan-cerny ok, good

@jan-cerny jan-cerny merged commit 1e4c15f into ComplianceAsCode:master Jun 11, 2026
56 of 58 checks passed
@jan-cerny jan-cerny added the Highlight This PR/Issue should make it to the featured changelog. label Jun 11, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Highlight This PR/Issue should make it to the featured changelog. needs-ok-to-test Used by openshift-ci bot. New Product Issues or pull requests related to new Products. Ubuntu Ubuntu product related.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants