Merge noble => resolute by aramprice · Pull Request #630 · cloudfoundry/bosh-linux-stemcell-builder

aramprice · 2026-06-10T03:43:46Z

NOTE: this repository uses a "Merge Forward" strategy

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

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

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

coderabbitai · 2026-06-10T03:44:20Z

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro

Run ID: 0ae1d6cd-c736-44be-9909-2fb1c19e9834

📥 Commits

Reviewing files that changed from the base of the PR and between 36e241f and 0be770f.

📒 Files selected for processing (4)

ci/tasks/build.sh
ci/tasks/os-images/build.sh
image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4
image-metalinks/ubuntu-noble/ubuntu-noble.meta4

Walkthrough

This PR addresses two independent maintenance concerns in the stemcell builder. First, it updates the CI build scripts to preserve environment variables during privileged command execution, particularly the SHLVL variable which prevents early shell exit from logout handlers. Second, it refreshes the Ubuntu stemcell image metadata files (Jammy and Noble) with new integrity hashes, updated archive sizes, and version increments.

Suggested reviewers

mkocher
rkoster

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title 'Merge noble => resolute' accurately describes the main change: merging the ubuntu-noble branch into the ubuntu-resolute branch as part of the repository's merge-forward strategy.
Description check	✅ Passed	The pull request description matches the required template exactly, including the merge-forward strategy explanation and numbered workflow steps.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

📝 Generate docstrings

Create stacked PR
Commit on current branch

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch ubuntu-noble

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 · 2026-06-10T03:44:39Z

@coderabbitai review

coderabbitai · 2026-06-10T03:44:44Z

✅ Action performed

Review finished.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

Copilot

Pull request overview

This PR updates Ubuntu OS-image metalinks and adjusts CI task wrappers used to run the build under the ubuntu user, consistent with the repo’s merge-forward workflow between branches.

Changes:

Bump ubuntu-noble and ubuntu-jammy OS-image metalinks (hashes/sizes, version numbers, published timestamps).
Update CI build entrypoints to run bundle exec rake ... with quoted rake arguments and a restricted sudo --preserve-env=... list.

Reviewed changes

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

File	Description
image-metalinks/ubuntu-noble/ubuntu-noble.meta4	Updates OS image + usn-log versions and associated hashes/metadata.
image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4	Updates OS image + usn-log versions and associated hashes/metadata.
ci/tasks/os-images/build.sh	Changes `sudo` invocation (restricted preserved env) and quotes rake task arguments.
ci/tasks/build.sh	Changes `sudo` invocation (restricted preserved env) and quotes rake task arguments.

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

Copilot

Pull request overview

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

bosh-admin-bot and others added 5 commits June 9, 2026 21:42

Bump os-image tgz

4a2c430

CI: use explicit list with --preserve-env

e51599f

CI: pass SHLVL to make ~ubuntu/.bash_logout succeed

6ba0f9e

Bump os-image tgz

0be770f

Copilot AI review requested due to automatic review settings June 10, 2026 03:43

Copilot started reviewing on behalf of aramprice June 10, 2026 03:43 View session

Copilot AI reviewed Jun 10, 2026

View reviewed changes

Comment thread ci/tasks/os-images/build.sh

Comment thread ci/tasks/build.sh

Comment thread ci/tasks/os-images/build.sh

Comment thread ci/tasks/build.sh

coderabbitai Bot approved these changes Jun 10, 2026

View reviewed changes

aramprice requested a review from Copilot June 10, 2026 03:56

Copilot started reviewing on behalf of aramprice June 10, 2026 03:56 View session

aramprice requested a review from mkocher June 10, 2026 03:57

Copilot AI reviewed Jun 10, 2026

View reviewed changes

Comment thread ci/tasks/os-images/build.sh

Comment thread ci/tasks/build.sh

aramprice merged commit 2ca1acf into ubuntu-resolute Jun 10, 2026
15 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge noble => resolute#630

Merge noble => resolute#630
aramprice merged 5 commits into
ubuntu-resolutefrom
ubuntu-noble

aramprice commented Jun 10, 2026

Uh oh!

coderabbitai Bot commented Jun 10, 2026 •

edited

Loading

Uh oh!

aramprice commented Jun 10, 2026

Uh oh!

coderabbitai Bot commented Jun 10, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

aramprice commented Jun 10, 2026

Uh oh!

coderabbitai Bot commented Jun 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Suggested reviewers

Uh oh!

aramprice commented Jun 10, 2026

Uh oh!

coderabbitai Bot commented Jun 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

coderabbitai Bot commented Jun 10, 2026 •

edited

Loading

coderabbitai Bot commented Jun 10, 2026 •

edited

Loading