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

Ubuntu/oracular #5705

Merged
merged 3 commits into from
Sep 13, 2024
Merged

Conversation

blackboxsw
Copy link
Collaborator

@blackboxsw blackboxsw commented Sep 13, 2024

Bug fix release for upload per https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/2080688

steps to create this branch

git checkout upstream/ubuntu/devel
git cherry-pick 
aad528672b4a05d43c74fe1a9f8df86df19ff24b
git cherry-pick 2c80c5a0a5e0c2b4b45b85ae1acd9dcd9a7e843b
git reset HEAD~2 # to consolidate both  cherry-picks to a single patch
git diff > ../fix-nocloudnet-seedfrom.patch
git checkout .
quilt new cpick-nocloudnet-seedfrom-sysconfig-fix.patch
quilt add cloudinit/sources/DataSourceNoCloud.py
quilt add tests/unittests/sources/test_nocloud.py
git apply ../fix-nocloudnet-seedfrom.patch
quilt refresh
quilt header --dep3 -e
quilt pop -a 
git commit -am 'Add d/p/cpick....'
dch -i # manually Add  changelog entry and version
git commit -am 'update changelog'
# manually set d/changelog version to oracular for release
git commit -am 'releasing cloud-init version...'

Additonal context

  • I chose to consolidate the two separate cherry-picks into a single quilt patch to track against the LP bug. This involved manually applying the cherry-picks and consolidating them as a single patch when creating the quilt patch.
  • The prefix d/p/cpick- is significant as next new_upstream_snapshot we run against ubuntu/devel and debian/patches/cpick-* files are dropped as they are known to be upstream commits already present
  • Also expectation is the breaks daily build recipe because carrying the cpick file in ubuntu/devel will merge fine against tip of main, but we can't reapply this changeset with quilt push -a as it's already there,

@blackboxsw blackboxsw changed the base branch from ubuntu/devel to ubuntu/oracular September 13, 2024 21:17
@TheRealFalcon TheRealFalcon changed the title Ubuntu/devel Ubuntu/oracular Sep 13, 2024
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 94674d6 into canonical:ubuntu/oracular Sep 13, 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