Conversation
This one has a license valid until June/July.
There was a problem hiding this comment.
Pull request overview
Re-enables build-time CIS scanning for Ubuntu VHD builds by running both CIS Level 1 and Level 2 assessments, then comparing results against updated Ubuntu 22.04/24.04 baselines to detect regressions.
Changes:
- Default CIS scanning to enabled (
SKIP_CISnow defaults tofalse) and generate a combined CIS report annotated with[L1]/[L2]. - Update CIS scanning to produce and upload separate L1 and L2 text reports (plus L2 HTML) and then assemble them into the existing
cis-report.txtartifact format. - Refresh CIS baseline files for Ubuntu 22.04 and 24.04.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
vhdbuilder/packer/vhd-scanning.sh |
Enables CIS scanning by default; downloads L1/L2 reports and assembles a combined cis-report.txt for baseline comparison. |
vhdbuilder/packer/cis-report.sh |
Runs CIS assessor twice (L1 and L2) and uploads both text reports plus the L2 HTML report. |
vhdbuilder/packer/cis/baselines/ubuntu/22.04.txt |
Updates stored baseline output to match the new combined report format and current results. |
vhdbuilder/packer/cis/baselines/ubuntu/24.04.txt |
Updates stored baseline output to match the new combined report format and current results. |
.pipelines/templates/.builder-release-template.yaml |
Bumps the downloaded cisassessor universal package version used during builds. |
|
PR #7876 Review: Re-enable Build-Time CIS Scanning ✅ No Configuration Changes — Confirmed Safe This PR does NOT make any configuration or remediation changes to the VHD.
The only two pre-scan commands (systemctl disable gcd.service and chmod 640
🟢 Verdict: Safe to Merge No system configuration is being applied. This is a scan-only change with |
What this PR does / why we need it:
No changes to node configuration.
Which issue(s) this PR fixes:
Fixes #