Merge jammy => noble#634
Closed
aramprice wants to merge 10 commits into
Closed
Conversation
CentOS stemcells are no longer built, so this drops dead stages, assets, and code paths. Also removes the default_su_directive override (already removed on ubuntu-noble), which silently overrode the correct 'su root syslog' set globally in ubuntu-logrotate.conf.
Explicitly pass: - GEM_HOME - BUILD_TIME - UBUNTU_ADVANTAGE_TOKEN - UBUNTU_FIPS_USE_IAAS_KERNEL Fixes: ``` sudo: preserving the entire environment is not supported, '--preserve-env' is ignored ubuntu@21f652d6-b208-4386-b0c0-097e26578228:/tmp/build/44575cf5$ set -e ubuntu@21f652d6-b208-4386-b0c0-097e26578228:/tmp/build/44575cf5$ ubuntu@21f652d6-b208-4386-b0c0-097e26578228:/tmp/build/44575cf5$ cd "/tmp/build/44575cf5/bosh-linux-stemcell-builder" ubuntu@21f652d6-b208-4386-b0c0-097e26578228:/tmp/build/44575cf5/bosh-linux-stemcell-builder$ bundle install Bundler 4.0.13 is running, but your lockfile was generated with 2.5.23. Installing Bundler 2.5.23 and restarting using that version. Fetching gem metadata from https://rubygems.org/. Fetching bundler 2.5.23 Retrying download gem from https://rubygems.org/ due to error (2/4): Bundler::PermissionError There was an error while trying to write to `/usr/local/lib/ruby/gems/3.3.0/cache/bundler-2.5.23.gem`. It is likely that you need to grant write permissions for that path. ``` ^ https://bosh.ci.cloudfoundry.org/teams/stemcell/pipelines/ubuntu-resolute-builder/jobs/build-os-image/builds/1#L6a052874:4:13
Remove CentOS-specific code and assets
Contributor
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: ASSERTIVE Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
Member
Author
|
Closing if favor of manual merge, GH can't handle the conflicts. |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR merges changes forward from the jammy line into the noble line by removing CentOS-specific build/test artifacts and updating CI/build metadata so the noble branch reflects the current (Ubuntu-focused) stemcell builder behavior.
Changes:
- Remove CentOS-specific stage assets/scripts (password policy patches, logrotate config, audit stage) and related spec coverage.
- Update CI task scripts to adjust
sudoenvironment preservation and quote rake task invocations. - Bump the ubuntu-jammy OS image metalink version/hashes and refresh a few docs/comments to refer to Ubuntu instead of CentOS.
Reviewed changes
Copilot reviewed 16 out of 16 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| stemcell_builder/stages/system_open_vm_tools/apply.sh | Removes an obsolete CentOS-specific comment during open-vm-tools install. |
| stemcell_builder/stages/password_policies/assets/centos/system-auth.patch | Deletes CentOS PAM policy patch asset. |
| stemcell_builder/stages/password_policies/assets/centos/password-auth.patch | Deletes CentOS PAM policy patch asset. |
| stemcell_builder/stages/logrotate_config/assets/default_su_directive | Removes CentOS-focused logrotate su directive asset. |
| stemcell_builder/stages/logrotate_config/assets/centos-logrotate.conf | Deletes CentOS logrotate.conf asset. |
| stemcell_builder/stages/logrotate_config/apply.sh | Removes installation of the deleted default_su_directive asset. |
| stemcell_builder/stages/image_install_grub/apply.sh | Updates example paths in comments from CentOS to Ubuntu. |
| stemcell_builder/stages/image_install_grub_softlayer_two_partitions/apply.sh | Updates example paths in comments from CentOS to Ubuntu. |
| stemcell_builder/stages/image_install_grub_efi/apply.sh | Updates example paths in comments from CentOS to Ubuntu. |
| stemcell_builder/stages/bosh_audit_centos/apply.sh | Removes CentOS audit stage script. |
| image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 | Updates metalink hashes/size/version/published timestamp for the jammy OS image tarball and usn-log.json. |
| ci/tasks/os-images/build.sh | Adjusts sudo invocation/env preservation and quotes the rake task invocation. |
| ci/tasks/build.sh | Adjusts sudo invocation/env preservation and quotes the rake task invocation. |
| bosh-stemcell/spec/support/stemcell_shared_examples.rb | Removes spec that asserted presence/content of the deleted logrotate default_su_directive. |
| bosh-stemcell/lib/shellout_types/service.rb | Drops CentOS from distro detection for service enablement checks. |
| .github/pull_request_template.md | Updates merge-forward instructions to match current branch naming/flow. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+38
to
42
| # pass SHLVL or '~ubuntu/.bash_logout' will exit 1 | ||
| sudo --set-home --user ubuntu \ | ||
| --preserve-env=GEM_HOME,SHLVL,BUILD_TIME,UBUNTU_ADVANTAGE_TOKEN,UBUNTU_DEBOOTSTRAP_MIRROR \ | ||
| -- /bin/bash --login <<SUDO | ||
| set -e |
Comment on lines
+80
to
84
| # pass SHLVL or '~ubuntu/.bash_logout' will exit 1 | ||
| sudo --set-home --user ubuntu \ | ||
| --preserve-env=GEM_HOME,SHLVL,UBUNTU_ADVANTAGE_TOKEN,UBUNTU_FIPS_USE_IAAS_KERNEL \ | ||
| -- /bin/bash --login <<SUDO | ||
| set -e |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
NOTE: this repository uses a "Merge Forward" strategy
Changes should be made in the earliest applicable branch, and
merged forward through subsequent branches.
ubuntu-<short_name-N>ubuntu-<short_name-N>intoubuntu-<short_name-N+1>