Skip to content

Merge jammy#582

Closed
aramprice wants to merge 28 commits intoubuntu-noblefrom
merge-jammy
Closed

Merge jammy#582
aramprice wants to merge 28 commits intoubuntu-noblefrom
merge-jammy

Conversation

@aramprice
Copy link
Copy Markdown
Member

NOTE: this repository uses a "Merge Forward" strategy

selzoc and others added 28 commits April 20, 2026 20:02
In
https://lists.ubuntu.com/archives/jammy-changes/2024-September/033387.html
it says:
"    Packaging restructuring:
    - Split netplan-generator into separate package to make the Python
      dependency optional.
    - Split python3-netplan bindings into a separate package"

Newer Azure builds pull in this new netplan version due to cloud-init.
It does not seem like there are any functional changes that we care
about.

ai-assisted=yes
[TNZ-88995]
We don't really ever want these builds to stack up, and I believe the
attempts: 3 just lead to longer failure cycles.

ai-assisted=yes
[TNZ-88995]
Include netplan refactor packages in Azure dpkg list
…uilder

Serialize stemcell builds, and remove attempts
The new error checking was finding errors. Going back to the old code
which did not check for errors but did work for teams. Jammy-on-Jammy
-on-Garden is a pretty niche use case these days, so this seems ok.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
- set explicitly in pipeline config
- delete unused *.meta4 files
- delete *.meta4 files for unsupported stemcells
Remove conditional path in CI that could download the OS_IMAGE using
`meta4 file-download`. Remove rake tasks which supported this path, and
remove references from docs.
Copilot AI review requested due to automatic review settings April 25, 2026 00:33
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Apr 25, 2026

Important

Review skipped

Too many files!

This PR contains 155 files, which is 5 over the limit of 150.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro

Run ID: a7b24e42-f11d-49f9-8bd3-cd28a053401f

📥 Commits

Reviewing files that changed from the base of the PR and between 11de246 and cd4d01f.

⛔ 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 (155)
  • .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/lib/shellout_types/service.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/lib/prelude_agent.bash
  • 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/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/apply.sh
  • stemcell_builder/stages/bosh_alicloud_agent_settings/assets/agent.json
  • stemcell_builder/stages/bosh_alicloud_agent_settings/assets/agent.md
  • stemcell_builder/stages/bosh_audit_centos/apply.sh
  • stemcell_builder/stages/bosh_aws_agent_settings/apply.sh
  • 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/apply.sh
  • stemcell_builder/stages/bosh_azure_agent_settings/assets/agent.json
  • stemcell_builder/stages/bosh_cloudstack_agent_settings/apply.sh
  • 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/apply.sh
  • 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/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/apply.sh
  • 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/apply.sh
  • stemcell_builder/stages/logrotate_config/assets/centos-logrotate.conf
  • stemcell_builder/stages/logrotate_config/assets/default_su_directive
  • stemcell_builder/stages/logrotate_config/assets/logrotate.timer
  • stemcell_builder/stages/logrotate_config/assets/opensuse-logrotate.conf
  • stemcell_builder/stages/password_policies/assets/centos/password-auth.patch
  • stemcell_builder/stages/password_policies/assets/centos/system-auth.patch
  • 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_open_vm_tools/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

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

@aramprice aramprice changed the base branch from ubuntu-jammy to ubuntu-noble April 25, 2026 00:33
@linux-foundation-easycla
Copy link
Copy Markdown

CLA Missing ID CLA Not Signed

@aramprice
Copy link
Copy Markdown
Member Author

Attempting to recreate with correct base

@aramprice aramprice closed this Apr 25, 2026
@aramprice aramprice deleted the merge-jammy branch April 25, 2026 00:34
@aramprice aramprice restored the merge-jammy branch April 25, 2026 00:35
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

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 OS-image/stemcell-builder changes and standardizes how Ubuntu OS image metalinks are stored and consumed by CI, while removing the old “download remote OS image during stemcell build” flow.

Changes:

  • Add/update OS-image metalinks under image-metalinks/<branch>/ (including new noble + jammy entries) and remove the old PoC metalink location.
  • Update CI tasks/pipeline to treat os-image-tarball as a required input and to read metalinks from the repo-root image-metalinks/ path.
  • Simplify rake tasks by removing stemcell:download_os_image / stemcell:build_with_local_os_image and making stemcell:build require an os_image_path.

Reviewed changes

Copilot reviewed 10 out of 11 changed files in this pull request and generated no comments.

Show a summary per file
File Description
image-metalinks/ubuntu-noble/ubuntu-noble.meta4 Adds noble OS-image + usn-log metalink metadata at the repo-root location.
image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 Adds jammy OS-image + usn-log metalink metadata at the repo-root location.
ci/tasks/os-images/build.sh Updates permissions/flow for OS-image build and relies on repo-root layout.
ci/tasks/build.yml Makes os-image-tarball a required input to the stemcell build task.
ci/tasks/build.sh Always uses a local OS image tarball and calls the unified stemcell:build task.
ci/tasks/build-release-metadata.sh Fixes metalink path to repo-root image-metalinks/<branch>/....
ci/pipelines/builder.yml Updates metalink resource URI/path and meta4 naming to include agent_suffix.
bosh-stemcell/spec/assets/dpkg-list-ubuntu-azure-additions.txt Updates expected Azure package additions list.
bosh-stemcell/image-metalinks/ubuntu_noble_poc/ubuntu-noble.meta4 Removes obsolete PoC metalink file.
Rakefile Removes remote download/build-with-local split; stemcell:build now requires os_image_path.
README.md Updates docs to use the unified stemcell:build task signature.

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

@aramprice aramprice deleted the merge-jammy branch April 25, 2026 00:52
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.

5 participants