Skip to content

Merge forward ubuntu-jammy to ubuntu-noble - #698

Merged
ystros merged 55 commits into
ubuntu-noblefrom
ubuntu-jammy
Jul 30, 2026
Merged

Merge forward ubuntu-jammy to ubuntu-noble#698
ystros merged 55 commits into
ubuntu-noblefrom
ubuntu-jammy

Conversation

@ystros

@ystros ystros commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

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

AI Review Feedback

All AI review comments (CodeRabbit, and Copilot when assigned) must be resolved before human reviewers will look at the PR. For each comment, either:

  • Make the suggested change, or
  • Reply to the comment explaining why it does not apply, then resolve the thread.

bosh-admin-bot and others added 30 commits July 11, 2026 10:03
Add europe-north2 region and europe-north2-a zone to the
light-google-environment-oss terraform resource to fix the
failing create-light-google-ubuntu-jammy-1 build.

See: https://bosh.ci.cloudfoundry.org/teams/stemcell/pipelines/ubuntu-jammy/jobs/create-light-google-ubuntu-jammy-1/builds/16

ai-assisted=yes
[TNZ-116382] Monthly Release - July patch
N1 machine types are not available in europe-north2. Switch to
e2-standard-2 (2 vCPU, 8 GB) which is supported in all europe-north2
zones and is a direct equivalent to n1-standard-2.

ai-assisted=yes
[TNZ-116382] Monthly Release - July patch
…urope-north2

Fix GCE terraform region/zone for light stemcell CI pipeline
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 6 to 7.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](actions/setup-go@v6...v7)

---
updated-dependencies:
- dependency-name: actions/setup-go
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
bosh-admin-bot and others added 25 commits July 18, 2026 10:02
This was used in a `cleanup-light-aws-builder-test-amis` job that has since
been removed from the pipeline in c2e1e3c
This pipeline exists in the ubuntu-jammy, ubuntu-noble, and ubuntu-resolute
pipelines. They all run at the same time. The cleanup of 3 year old images is
looking at ALL distributions in each pipeline. This caused failures where one
pipeline would delete an AMI and then the other 2 pipelines would try to delete
that AMI again and fail.

We cannot limit the cleanup to the current pipeline's OS, because we want to
clean up old AMIs even after a stemcell line is EOL and its pipeline has been
deleted. So this commit makes the cleanup script tolerant to the AMI having
been deleted.
@coderabbitai

coderabbitai Bot commented Jul 30, 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 Plus

Run ID: 57ef1d9d-bb8f-4284-836e-d01abfe88807

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

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.

@ystros
ystros merged commit b11dfa2 into ubuntu-noble Jul 30, 2026
14 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.

4 participants