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/devel #4415

Merged
merged 6 commits into from
Sep 6, 2023
Merged

Ubuntu/devel #4415

merged 6 commits into from
Sep 6, 2023

Conversation

blackboxsw
Copy link
Collaborator

do not squash merge

New upstream snapshot to avoid dependency on gpgconf fix LP: #2034273.

procedure to create branch


git clone [email protected]:canonical/cloud-init.git -o upstream
cd cloud-init
git fetch upstream --tags
git checkout upstream/ubuntu/devel -B ubuntu/devel
new_upstream_snapshot.py -c 23.3.1

Additional Context

Looking to avoid direct dependency on gpgconf as that's not ideal. this was originally by daily builds of ubuntu-minimal breaking on mantic when cloud-init 23.3 was published to mantic.

While this fix avoids cloud-init dependency on gpgconf package, we may also need some sort of fix for ubuntu-minimal to ensure that gpg package is still installed in ubuntu-minimal per @philroche's Merge proposal https://code.launchpad.net/~philroche/ubuntu-seeds/+git/ubuntu/+merge/450569.

Test Steps

# build this package
$ build-package
$ sbuild --dist=mantic  --arch=amd64  --arch-all ../out/*dsc

# test with this package
CLOUD_INIT_CLOUD_INIT_SOURCE=../out/cloud-init*deb CLOUD_INIT_PLATFORM=lxd_container CLOUD_INIT_OS_IMAGE=mantic tox -e integration-tests tests/integration_tests/bugs/test_lp1813396.py

Checklist:

  • My code follows the process laid out in the documentation
  • I have updated or added any unit tests accordingly
  • I have updated or added any documentation accordingly

TheRealFalcon and others added 4 commits September 5, 2023 16:30
It's possible to still have cgroup output for cloud-config.service
even if there are no spawned processes. Instead, use systemd-cgls
to list the cgroup and ensure there are isn't more than 1 line of
output.
Upstream commit 842d045 introduced a dependency on gpgconf
utility without a strict Depends: clause in debian/control.

While gnupg is in Recommends for cloud-init, some images
like Ubuntu minimal will not install the package Recommends
to keep images smaller.

To avoid adding a hard Requires dependency on gpgconf, use os.kill
directly to stop any dirmngr and gpg-agent when spawned by
cloud-config's root ppid due to apt-related user-data.

NOOP If no gpg-agent or dirmngr processes are spawned by PPID 1.

LP: #2034273
Bump the version in cloudinit/version.py to 23.3.1 and
update ChangeLog.
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 9a6076d into canonical:ubuntu/devel Sep 6, 2023
23 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