canonical / cloud-init

Official upstream for the cloud-init: cloud instance initialization
https://cloud-init.io/
Other
2.89k stars 861 forks source link

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

Closed blackboxsw closed 6 days ago

blackboxsw commented 1 week ago

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