Skip to content

test: apt resolute gpg remove accounts for gpg-from-sq#6902

Open
blackboxsw wants to merge 2 commits into
canonical:mainfrom
blackboxsw:tests-gpg-metapkg-avoid-gpg-from-sq
Open

test: apt resolute gpg remove accounts for gpg-from-sq#6902
blackboxsw wants to merge 2 commits into
canonical:mainfrom
blackboxsw:tests-gpg-metapkg-avoid-gpg-from-sq

Conversation

@blackboxsw

Copy link
Copy Markdown
Collaborator

Proposed Commit Message

test: apt resolute gpg remove accounts for gpg-from-sq

On resolute and newer, removal of gpg triggers the install
of gpg-from-sq as an alternative for the metapkg if
python3-software-properties or libgpgme45 are still installed.

Ensure removal of the additional rdepends to avoid triggering
installation of gpg-from-sq during the removal of gpg.

Additional Context

Daily integration test failures in CI on test_missing_deps. Symptom is gpg was not seen as being re-installed after initial removal (because gpg-from-sq was added in it's place, as seen in /var/log/apt/term.log during initial test image creation)

Test Steps

CLOUD_INIT_OS_IMAGE=questing CLOUD_INIT_PLATFORM=lxd_container CLOUD_INIT_CLOUD_INIT_SOURCE=NONE tox -e integration-tests -- tests/integration_tests/modules/test_apt_functionality::test_intsall_missing_deps

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>)

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Updates the apt integration test setup to prevent unintended installation of gpg-from-sq on newer Ubuntu releases when removing gpg, addressing CI failures in test_install_missing_deps.

Changes:

  • Add release gating for the gpg removal user-data to also remove packages that would otherwise pull in gpg-from-sq.
  • Refactor the test user-data into a parameterized template and package lists to simplify per-release behavior.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread tests/integration_tests/modules/test_apt_functionality.py Outdated
holmanb
holmanb previously approved these changes Jun 12, 2026

@holmanb holmanb left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Please address the review comment. Otherwise this looks good.

@blackboxsw blackboxsw force-pushed the tests-gpg-metapkg-avoid-gpg-from-sq branch from 62cc7cc to cb9d467 Compare June 17, 2026 14:30
@blackboxsw

Copy link
Copy Markdown
Collaborator Author

Unrelated test failures resolved by #6908.

holmanb
holmanb previously approved these changes Jun 23, 2026

@holmanb holmanb left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I left a nitpick, but this looks good to me.

Comment thread tests/integration_tests/modules/test_apt_functionality.py Outdated
@blackboxsw blackboxsw force-pushed the tests-gpg-metapkg-avoid-gpg-from-sq branch from bc24a6f to 83a8419 Compare June 26, 2026 14:11
On resolute and newer, removal of gpg triggers the install
of gpg-from-sq as an alternative for the metapkg if
python3-software-properties or libgpgme45 are still installed.

Ensure removal of the additional rdepends to avoid triggering
installation of gpg-from-sq during the removal of gpg.
@blackboxsw blackboxsw force-pushed the tests-gpg-metapkg-avoid-gpg-from-sq branch from 83a8419 to c575968 Compare June 26, 2026 14:14
@holmanb

holmanb commented Jun 26, 2026

Copy link
Copy Markdown
Member

Unrelated test failures resolved by #6908.

Can we update this PR to get passing tests?

@blackboxsw

Copy link
Copy Markdown
Collaborator Author

Unrelated test failures resolved by #6908.

Can we update this PR to get passing tests?

@holmanb sure, can you please review canonical/pycloudlib#506 so our integration tests will be fixed?

@blackboxsw blackboxsw requested a review from holmanb June 29, 2026 20:45
@blackboxsw

Copy link
Copy Markdown
Collaborator Author

@holmanb pycloudlib version is now fixed per canonical/pycloudlib#509. re-running the integration tests now pass. This is ready for review now.

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.

3 participants