Skip to content

Merge jammy => noble#628

Merged
aramprice merged 4 commits into
ubuntu-noblefrom
ubuntu-jammy
Jun 10, 2026
Merged

Merge jammy => noble#628
aramprice merged 4 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

aramprice and others added 4 commits June 9, 2026 17:18
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
Copilot AI review requested due to automatic review settings June 10, 2026 03:36
@coderabbitai

coderabbitai Bot commented Jun 10, 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: d11f6175-a642-4236-985c-35ce25384810

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.

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 line by updating the Jammy os-image metalink metadata and adjusting CI task scripts that run the Ruby build under sudo (notably tightening preserved environment variables and quoting the Rake task invocations).

Changes:

  • Bump ubuntu-jammy metalink hashes/size/version/published timestamp to 1083.0.0.
  • Update CI sudo invocation to preserve a targeted set of env vars (including SHLVL) and stop using an interactive shell.
  • Quote Rake task invocations to ensure bracketed arguments are passed as a single shell argument.

Reviewed changes

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

File Description
image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 Updates ubuntu-jammy artifact hashes/size and version metadata to a new release.
ci/tasks/os-images/build.sh Adjusts sudo + bash invocation and quotes Rake args for os-image builds.
ci/tasks/build.sh Adjusts sudo + bash invocation and quotes Rake args for stemcell builds.

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

Comment thread ci/tasks/build.sh
Comment thread ci/tasks/os-images/build.sh
@aramprice aramprice merged commit 0be770f into ubuntu-noble Jun 10, 2026
16 checks passed
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.

3 participants