Skip to content

Merge forward Jammy => Noble#619

Merged
aramprice merged 2 commits into
ubuntu-noblefrom
ubuntu-jammy
Jun 8, 2026
Merged

Merge forward Jammy => Noble#619
aramprice merged 2 commits into
ubuntu-noblefrom
ubuntu-jammy

Conversation

@aramprice

Copy link
Copy Markdown
Member

NOTE: this repository uses a "Merge Forward" strategy

Changes should be made in the earliest applicable branch, and
merged forward through subsequent branches.

  1. Create a PR into the oldest branch (ubuntu-<short_name>)
  2. After this PR has been merged create a merge-to-<next_short_name> branch
  3. Merge ubuntu-<short_name> into merge-to-<next_short_name>
  4. Create a PR to merge merge-to-<next_short_name> into ubuntu-<next_short_name>
  5. Repeat as needed for subsequent branches

bosh-admin-bot and others added 2 commits June 8, 2026 22:51
This seems to have been the default on ubuntu for a long time, so
removing our overrides to the configuration.
Copilot AI review requested due to automatic review settings June 8, 2026 23:48
@coderabbitai

coderabbitai Bot commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro

Run ID: dd302261-9681-4ade-a131-1cb7c41d35b5

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch ubuntu-jammy

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@aramprice aramprice merged commit 3b7f0a8 into ubuntu-noble Jun 8, 2026
16 checks passed

Copilot AI 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.

Pull request overview

This PR merges forward Jammy changes into the Noble branch, updating the Jammy OS image references and aligning auditd-related build/test behavior with the distro-provided systemd unit.

Changes:

  • Remove the build-time override of auditd.service and rely on the packaged unit file under /lib/systemd/system.
  • Bump the Jammy metalink to 1080.0.0 with updated hashes/sizes.
  • Update Jammy OS image specs to validate auditd’s systemd unit location/content (but one new assertion currently checks the wrong filesystem).

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

File Description
stemcell_builder/stages/bosh_audit_ubuntu/apply.sh Removes custom systemd unit copying/editing for auditd during image build.
image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 Updates Jammy image + USN log metalink version and checksums.
bosh-stemcell/spec/os_image/ubuntu_spec.rb Adjusts auditd systemd unit expectations to /lib/systemd/system and adds an assertion about not creating an override.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines +241 to +244
it "does not create '/etc/systemd/system/auditd.service'" do
expect(File.exist?("/etc/systemd/system/auditd.service")).to eq(false)
end

Comment on lines +12 to +16
<hash type="sha-512">be688838ca8686e5c90689bf2ab585cef1137c999b48c70b92f67a5c34dc15697b5d11c982ed6d71be1e1e7f7b4e0733884aa97c3f7a339a8ed03577cf74be09</hash>
<hash type="sha-256">01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b</hash>
<hash type="sha-1">adc83b19e793491b1c6ea0fd8b46cd9f32e592fc</hash>
<hash type="md5">68b329da9893e34099c7d8ad5cb9c940</hash>
<size>1</size>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants