Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Single cherry-pick fix into noble on top of what's queued in SRU verification. #5724

Merged

Conversation

blackboxsw
Copy link
Collaborator

@blackboxsw blackboxsw commented Sep 20, 2024

Sync single cherry-pick from upstream #5722 for release. Lay this cherry-pick down as a single quilt patch. Preferred to use the ubuntu/noble-24.3.x branch because we already have performed a new_upstream_snapshot.py against ubuntu/noble to fix daily recipes.

Proposed Commit Message

See individual commits

Procedure to create this branch

git fetch upstream
git checkout upstream/ubuntu/noble -B ubuntu/noble-24.3.x
# Start from the version of cloud-init in noble-proposed
git reset --hard ubuntu/24.3.1-0ubuntu0_24.04.1
# cherry-pick the ubuntu/oracular pending commit in review to get the quilt patch
git cherry-pick82b4b7e1436f3da2ae8285c7e9ef6815030a6ccd
# resolve minor merge conflict
vi debian/patches/series
git add debian/patches/series
git cherry-pick --continue
dch -i # manually add same d/changelog from oracular/ fix verson 24.04.2
git commit -am 'update changelog'

vi debian/changelog # set UNRELEASED to noble
git commit -am 'releasing cloud-init version 24.3.1-0ubuntu0~24.04.2'

Additional Context

Preferred to use the ubuntu/noble-24.3.x branch because we already have performed a new_upstream_snapshot.py against ubuntu/noble to fix daily recipes. The alternative could have been git reset --hard ubuntu/24.3.1-0ubuntu0_24.04.1 on ubutu/noble and push that back up to upstream before creating this PR.

Test Steps

Merge type

  • Squash merge using "Proposed Commit Message"
  • Rebase and merge unique commits. Requires commit messages per-commit each referencing the pull request number (#<PR_NUM>)

Copy link
Member

@TheRealFalcon TheRealFalcon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@blackboxsw blackboxsw merged commit 147ecab into canonical:ubuntu/noble-24.3.x Sep 23, 2024
19 of 20 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.

2 participants