Skip to content

Manually merge jammy => noble#649

Merged
aramprice merged 48 commits into
ubuntu-noblefrom
manually-merge-jammy
Jun 18, 2026
Merged

Manually merge jammy => noble#649
aramprice merged 48 commits into
ubuntu-noblefrom
manually-merge-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. PR should be created against the oldest stemcell branch, ex: ubuntu-<short_name-N>
  2. After this PR has been merged create a PR to merge ubuntu-<short_name-N> into ubuntu-<short_name-N+1>
  3. Repeat as needed for subsequent stemcell line branches

bosh-admin-bot and others added 18 commits June 17, 2026 23:51
Replace heredoc-based apply.sh scripts with static assets/agent.json
files (the same approach already used on ubuntu-noble). This makes the
two branches structurally identical so future jammy=>noble merge
forwards cannot silently resolve apply.sh conflicts in favour of the
wrong version.

- Delete prelude_agent.bash (PartitionerType: parted is now inlined as
  a static field in each assets/agent.json, as the function has
  unconditionally returned that string since 59a9c29 in 2019)
- Replace all 8 bosh_*_agent_settings/apply.sh heredocs with a single
  cp $assets_dir/agent.json line
- Add assets/agent.json for every stage carrying the full config
  (including UseMonitIptablesFirewall added in 8104abd)
- reorganize so YTT is also valid YAML
- remove some redundant function params
Copilot AI review requested due to automatic review settings June 18, 2026 22:17

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.

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

@coderabbitai

coderabbitai Bot commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

Warning

Review limit reached

@aramprice, we couldn't start this review because you've reached your PR review rate limit.

More reviews will be available in 8 minutes and 19 seconds. Learn how PR review limits work.

Your organization has run out of usage credits. Purchase more credits in the billing tab to continue.

⌛ How to resolve this issue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based credits.

🚦 How do rate limits work?

CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan refill rate.

For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, the refill rate gradually slows as usage increases. The highest same-day bursts are limited more strictly.

Please see our Fair Usage Limits Policy for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro

Run ID: 13817445-cb70-49fd-aa11-afb06afa5f66

📥 Commits

Reviewing files that changed from the base of the PR and between 440af5f and 0eb1f36.

⛔ Files ignored due to path filters (1)
  • stemcell_builder/stages/bosh_monit/assets/monit-5.29.0.tar.gz is excluded by !**/*.gz
📒 Files selected for processing (140)
  • .envrc
  • .github/workflows/sbom.yml
  • README.md
  • acceptance-tests/ipv4director/auditd/smoke_test.go
  • acceptance-tests/ipv4director/ipv6basic/basic_test.go
  • acceptance-tests/ipv4director/ipv6basic/manifest.yml
  • acceptance-tests/ipv4director/smoke/smoke_test.go
  • acceptance-tests/ipv6director/ipv6full/full_test.go
  • bosh-stemcell/lib/bosh/stemcell/build_environment.rb
  • bosh-stemcell/lib/bosh/stemcell/builder_options.rb
  • bosh-stemcell/lib/bosh/stemcell/definition.rb
  • bosh-stemcell/lib/bosh/stemcell/infrastructure.rb
  • bosh-stemcell/lib/bosh/stemcell/stage_collection.rb
  • bosh-stemcell/spec/assets/dpkg-list-ubuntu-azure-additions.txt
  • bosh-stemcell/spec/assets/dpkg-list-ubuntu-kernel.txt
  • bosh-stemcell/spec/assets/dpkg-list-ubuntu-softlayer-additions.txt
  • bosh-stemcell/spec/assets/dpkg-list-ubuntu-vsphere-additions.txt
  • bosh-stemcell/spec/assets/dpkg-list-ubuntu.txt
  • bosh-stemcell/spec/bosh/stemcell/builder_options_spec.rb
  • bosh-stemcell/spec/bosh/stemcell/definition_spec.rb
  • bosh-stemcell/spec/bosh/stemcell/infrastructure_spec.rb
  • bosh-stemcell/spec/bosh/stemcell/stage_collection_spec.rb
  • bosh-stemcell/spec/bosh/stemcell/stemcell_packager_spec.rb
  • bosh-stemcell/spec/os_image/ubuntu_spec.rb
  • bosh-stemcell/spec/spec_helper.rb
  • bosh-stemcell/spec/stemcells/alicloud_spec.rb
  • bosh-stemcell/spec/stemcells/aws_spec.rb
  • bosh-stemcell/spec/stemcells/azure_spec.rb
  • bosh-stemcell/spec/stemcells/cis_spec.rb
  • bosh-stemcell/spec/stemcells/fips_spec.rb
  • bosh-stemcell/spec/stemcells/google_spec.rb
  • bosh-stemcell/spec/stemcells/openstack_spec.rb
  • bosh-stemcell/spec/stemcells/softlayer_spec.rb
  • bosh-stemcell/spec/stemcells/stig_spec.rb
  • bosh-stemcell/spec/stemcells/ubuntu_spec.rb
  • bosh-stemcell/spec/stemcells/vcloud_spec.rb
  • bosh-stemcell/spec/stemcells/vsphere_spec.rb
  • bosh-stemcell/spec/stemcells/warden_spec.rb
  • bosh-stemcell/spec/support/os_image_chrony_shared_examples.rb
  • bosh-stemcell/spec/support/os_image_linux_kernel_modules_shared_examples.rb
  • bosh-stemcell/spec/support/os_image_linux_kernel_shared_examples.rb
  • bosh-stemcell/spec/support/os_image_shared_examples.rb
  • bosh-stemcell/spec/support/os_image_systemd_shared_examples.rb
  • bosh-stemcell/spec/support/stemcell_image.rb
  • bosh-stemcell/spec/support/stemcell_shared_examples.rb
  • ci/configure.sh
  • ci/docker/os-image-stemcell-builder/Dockerfile
  • ci/docker/os-image-stemcell-builder/Vagrantfile
  • ci/pipelines/builder.yml
  • ci/pipelines/vars.yml
  • docs/noble-dev.md
  • image-metalinks/ubuntu-noble/ubuntu-noble.meta4
  • scripts/repack-helpers/convert-raw-to-vmdk.sh
  • scripts/stemcell-repack-debugger.sh
  • stemcell_builder/stages/base_apt/apply.sh
  • stemcell_builder/stages/base_apt/assets/etc/apt/apt.conf.d/50unattended-upgrades
  • stemcell_builder/stages/base_ssh/apply.sh
  • stemcell_builder/stages/base_ssh/assets/10-ssh-firstboot-done.conf
  • stemcell_builder/stages/base_ubuntu_build_essential/apply.sh
  • stemcell_builder/stages/base_ubuntu_firstboot/apply.sh
  • stemcell_builder/stages/base_ubuntu_firstboot/assets/etc/rc.local
  • stemcell_builder/stages/base_ubuntu_firstboot/assets/etc/systemd/system/firstboot.service
  • stemcell_builder/stages/base_ubuntu_firstboot/assets/root/firstboot.sh
  • stemcell_builder/stages/base_ubuntu_packages/apply.sh
  • stemcell_builder/stages/base_ubuntu_packages/assets/apparmor-local-sbin.dhclient
  • stemcell_builder/stages/base_ubuntu_packages/assets/runit.service
  • stemcell_builder/stages/base_warden/apply.sh
  • stemcell_builder/stages/base_warden/assets/rosetta-compat.conf
  • stemcell_builder/stages/base_warden/assets/runit/cron/run
  • stemcell_builder/stages/base_warden/assets/runit/rsyslog/run
  • stemcell_builder/stages/base_warden/assets/runit/ssh/run
  • stemcell_builder/stages/base_warden/assets/runsvdir-start
  • stemcell_builder/stages/base_warden/assets/service
  • stemcell_builder/stages/base_warden/assets/unshare
  • stemcell_builder/stages/bosh_alicloud_agent_settings/assets/agent.json
  • stemcell_builder/stages/bosh_alicloud_agent_settings/assets/agent.md
  • stemcell_builder/stages/bosh_aws_agent_settings/assets/agent.json
  • stemcell_builder/stages/bosh_aws_agent_settings/assets/agent.md
  • stemcell_builder/stages/bosh_azure_agent_settings/assets/agent.json
  • stemcell_builder/stages/bosh_cloudstack_agent_settings/assets/agent.json
  • stemcell_builder/stages/bosh_enable_password_authentication/apply.sh
  • stemcell_builder/stages/bosh_go_agent/apply.sh
  • stemcell_builder/stages/bosh_go_agent/assets/bosh-agent.service
  • stemcell_builder/stages/bosh_go_agent/assets/runit/agent/log/run
  • stemcell_builder/stages/bosh_go_agent/assets/runit/agent/run
  • stemcell_builder/stages/bosh_go_agent/assets/runit/monit/down
  • stemcell_builder/stages/bosh_go_agent/assets/runit/monit/log/run
  • stemcell_builder/stages/bosh_go_agent/assets/runit/monit/run
  • stemcell_builder/stages/bosh_google_agent_settings/assets/agent.json
  • stemcell_builder/stages/bosh_google_agent_settings/assets/agent.md
  • stemcell_builder/stages/bosh_monit/apply.sh
  • stemcell_builder/stages/bosh_monit/assets/monit
  • stemcell_builder/stages/bosh_monit/assets/monit-access-helper.sh
  • stemcell_builder/stages/bosh_monit/assets/monit.service
  • stemcell_builder/stages/bosh_monit/assets/restrict-monit-api-access
  • stemcell_builder/stages/bosh_ntp/apply.sh
  • stemcell_builder/stages/bosh_openstack_agent_settings/assets/agent.json
  • stemcell_builder/stages/bosh_openstack_agent_settings/assets/agent.md
  • stemcell_builder/stages/bosh_softlayer_agent_settings/apply.sh
  • stemcell_builder/stages/bosh_sysctl/assets/60-bosh-sysctl.conf
  • stemcell_builder/stages/bosh_systemd_resolved/apply.sh
  • stemcell_builder/stages/bosh_systemd_resolved/assets/add-container-listener-address.conf
  • stemcell_builder/stages/bosh_systemd_resolved/assets/create-systemd-resolved-listener-address.service
  • stemcell_builder/stages/bosh_vsphere_agent_settings/assets/agent.json
  • stemcell_builder/stages/delay_monit_start/apply.sh
  • stemcell_builder/stages/dev_tools_config/assets/generate_dev_tools_file_list.sh
  • stemcell_builder/stages/image_create/apply.sh
  • stemcell_builder/stages/image_create_softlayer_two_partitions/apply.sh
  • stemcell_builder/stages/image_create_softlayer_two_partitions/config.sh
  • stemcell_builder/stages/image_install_grub/apply.sh
  • stemcell_builder/stages/image_install_grub_efi/apply.sh
  • stemcell_builder/stages/image_install_grub_efi/config.sh
  • stemcell_builder/stages/image_install_grub_softlayer_two_partitions/apply.sh
  • stemcell_builder/stages/image_install_grub_softlayer_two_partitions/config.sh
  • stemcell_builder/stages/logrotate_config/assets/logrotate.timer
  • stemcell_builder/stages/logrotate_config/assets/opensuse-logrotate.conf
  • stemcell_builder/stages/password_policies/assets/opensuse/common-account.patch
  • stemcell_builder/stages/password_policies/assets/opensuse/common-auth.patch
  • stemcell_builder/stages/password_policies/assets/opensuse/common-password.patch
  • stemcell_builder/stages/password_policies/assets/ubuntu/common-password.patch
  • stemcell_builder/stages/rsyslog_config/apply.sh
  • stemcell_builder/stages/rsyslog_config/assets/rsyslog_90-bosh-agent.conf
  • stemcell_builder/stages/rsyslog_config/assets/rsyslog_logrotate.conf
  • stemcell_builder/stages/static_libraries_config/apply.sh
  • stemcell_builder/stages/static_libraries_config/assets/static_libraries_list.txt
  • stemcell_builder/stages/system_azure_init/apply.sh
  • stemcell_builder/stages/system_azure_init/assets/etc/systemd/system/cloud-config.service.d/firstboot-blocker.conf
  • stemcell_builder/stages/system_azure_init/assets/etc/waagent/walinuxagent.service
  • stemcell_builder/stages/system_azure_network/apply.sh
  • stemcell_builder/stages/system_azure_network/assets/01-azure-sriov-unmanaged.network
  • stemcell_builder/stages/system_azure_network/assets/10-azure-sriov-unmanaged.rules
  • stemcell_builder/stages/system_google_packages/assets/instance_configs.cfg.template
  • stemcell_builder/stages/system_grub/apply.sh
  • stemcell_builder/stages/system_kernel_modules/apply.sh
  • stemcell_builder/stages/system_parameters/apply.sh
  • stemcell_builder/stages/system_softlayer_multipath_tools/apply.sh
  • stemcell_builder/stages/system_softlayer_multipath_tools/assets/etc/multipath.conf
  • stemcell_builder/stages/system_softlayer_netplan/apply.sh
  • stemcell_builder/stages/system_softlayer_open_iscsi/apply.sh
  • stemcell_builder/stages/udev_aws_rules/assets/nvme-id
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch manually-merge-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.

@linux-foundation-easycla

linux-foundation-easycla Bot commented Jun 18, 2026

Copy link
Copy Markdown

CLA Not Signed

@aramprice aramprice changed the base branch from ubuntu-jammy to ubuntu-noble June 18, 2026 22:18
@aramprice

Copy link
Copy Markdown
Member Author

/easycla

1 similar comment
@aramprice

Copy link
Copy Markdown
Member Author

/easycla

@aramprice aramprice merged commit 9d7b3d6 into ubuntu-noble Jun 18, 2026
11 of 12 checks passed
@aramprice aramprice deleted the manually-merge-jammy branch June 18, 2026 22:24
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.

6 participants