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/jammy: new_upstream_snapshot refresh patches to fix daily build recipe #5690

Closed
wants to merge 1,021 commits into from

Conversation

blackboxsw
Copy link
Collaborator

Perform new_upstream_snapshot,py to sync unreleased tip of main into ubuntu/jammy in order to fix daily recipe builds which are failing due to commit 9cc458c drift in systemd files which no-singleprocess.patch removes.

Proposed Commit Message

-- see top three most recent separate commits

Additional Context

failed build recipe logs
the error:


patching file systemd/cloud-init-main.service.tmpl
Hunk #1 FAILED at 1.
Not deleting file systemd/cloud-init-main.service.tmpl as content differs from patch

steps to create this branch

new_upstream_snapshot.py # expect failure
quilt push -a
quilt push -f
rm systemd/cloud-init-main.service.tmpl
quilt refresh
quilt pop -a 
git commit -am 'refresh patches....'
new_upstream_snapshot.py -p quilt
# enter no SRU bug to leave UNRELEASED state
# manually add refreshed patches to d/changelog

Test Steps

git checkout main
git pull
git reset --hard upstream/main
git merge ubuntu/focal
quilt push -a
tox -e py3
quilt pop -a

Merge type

  • git push upstream ubuntu/focal from command line once approved
  • Squash merge using "Proposed Commit Message"
  • Rebase and merge unique commits. Requires commit messages per-commit each referencing the pull request number (#<PR_NUM>)

blackboxsw and others added 30 commits June 6, 2023 16:08
patches:
debian/patches/expire-on-hashed-users.patch
In the dpkg-maintscript-helper manpage:
If the conffile has not been shipped for several versions, and you are
now modifying the maintainer scripts to clean up the obsolete file,
prior-version should be based on the version of the package that you
are now preparing, not the first version of the package that lacked the
conffile
Commit cda82fe warranted downstream patch refresh to
fix daily recipe builds against main.

patches:
debian/patches/retain-old-groups.patch
Add Akamai to the default templates to allow datasource discovery.

Co-authored-by: Chad Smith <[email protected]>
Co-authored-by: Chad Smith <[email protected]>
cc_apt_configure will use apt_pkg from this deb if present to
read apt configuration for Dir::Etc::sourceparts/sourcelist values.

When absent, rely on the command apt-config dump.
holmanb and others added 28 commits July 11, 2024 16:24
patches:
debian/patches/no-nocloud-network.patch
debian/patches/no-single-process.patch
Bump the version in cloudinit/version.py to 24.3 and
update ChangeLog.
Bump the version in cloudinit/version.py to 24.3.1 and
update ChangeLog.
patches:
debian/patches/cli-retain-file-argument-as-main-cmd-arg.patch
debian/patches/no-nocloud-network.patch
debian/patches/revert-551f560d-cloud-config-after-snap-seeding.patch
Revert remaning functional references to cloud-init-network service
which will not exist on stable releases.
patches:
- d/p/keep-dhclient-as-priority-client.patch
- d/p/no-single-process.patch
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.