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

packaging,tests: sync patches from debian #14475

Merged
merged 13 commits into from
Sep 20, 2024

Conversation

zyga
Copy link
Contributor

@zyga zyga commented Sep 6, 2024

This accounts for most of the changes we have in Debian. The remaining few patches are really Debian specific or probably paper over some bugs that we should not merge here.

Copy link
Collaborator

@sergiocazzolato sergiocazzolato left a comment

Choose a reason for hiding this comment

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

Thanks

packaging/debian-sid/snapd.lintian-overrides Outdated Show resolved Hide resolved
@@ -269,6 +269,8 @@ prepare_project() {
# no need to modify anything further for autopkgtest
# we want to run as pristine as possible
if [ "$SPREAD_BACKEND" = autopkgtest ]; then
create_test_user
systemctl enable --now snapd.socket
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Debian CI still reports occasional failures. I don't quite know why but I suspect this is only partially sufficient.

Copy link
Contributor

@bboozzoo bboozzoo left a comment

Choose a reason for hiding this comment

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

LGTM

None of the old overrides applied anymore.

Signed-off-by: Zygmunt Krynicki <[email protected]>
Sudo access is managed by the "needs-sudo" flag. We can drop our custom logic
and associated manipulation. This also ensures the testbed is correctly
selected, and incompatible systems are rejected.

Signed-off-by: Zygmunt Krynicki <[email protected]>
Internet is required to pull Go dependencies to build and install spread, as
well as to download snap packages from the store.

Signed-off-by: Zygmunt Krynicki <[email protected]>
The former go get command is deprecated with current Go, and no longer works
correctly.

Signed-off-by: Zygmunt Krynicki <[email protected]>
Spread needs to login to an account with a non-empty password. Set the password
of the autopkgtest user account to the same value as the account name.

Signed-off-by: Zygmunt Krynicki <[email protected]>
There is no guarantee that ID and VERSION_ID are set in /etc/os-release.
Provide defaults for ID and VERSION_ID so that spread runs with _some_ system
name. Spread rejects system names with two consecutive dashes, so use a
special-case for unset VERSION_ID since we know it is used in a context of the
Debian archive.

Signed-off-by: Zygmunt Krynicki <[email protected]>
Add entries for Debian unstable "sid" to allow running the integration test
suite while traversing migrations in the Debian archive.

Signed-off-by: Zygmunt Krynicki <[email protected]>
Update for compatibility level 9 to 13 [1].

- remove --fail-missing from dh
- remove --with=systemd from dh
- drop autoreconf dependencies (obsolete since level 10)

[1] https://manpages.debian.org/testing/debhelper/debhelper-compat-upgrade-checklist.7.en.html#v13

Signed-off-by: Zygmunt Krynicki <[email protected]>
The smoke test suite depends on running things as the unprivilege
user "test" with the specific UID 12345.

Signed-off-by: Zygmunt Krynicki <[email protected]>
For reasons I don't quite understand, and cannot reproduce when running
autopkgtest locally, when the system is tested on the Debian infrastructure
snapd ends up installed but not enabled.

Enable the socket to at least have a chance to run something.

Signed-off-by: Zygmunt Krynicki <[email protected]>
@zyga zyga force-pushed the tweak/sync-from-debian-SNAPDENG-31362 branch from 27b2c3b to 024318d Compare September 19, 2024 17:09
@zyga zyga added this to the 2.66 milestone Sep 20, 2024
@zyga zyga merged commit 848d437 into canonical:master Sep 20, 2024
53 of 54 checks passed
@zyga zyga deleted the tweak/sync-from-debian-SNAPDENG-31362 branch September 20, 2024 14:36
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