Merge ~ahasenack/ubuntu/+source/libseccomp:noble-dep8-skip-armhf-lxd-ubuntu into ubuntu/+source/libseccomp:ubuntu/devel

Proposed by Andreas Hasenack
Status: Merged
Approved by: git-ubuntu bot
Approved revision: not available
Merged at revision: 5079296978aab29d403839fd3998031aa4033a66
Proposed branch: ~ahasenack/ubuntu/+source/libseccomp:noble-dep8-skip-armhf-lxd-ubuntu
Merge into: ubuntu/+source/libseccomp:ubuntu/devel
Diff against target: 37 lines (+18/-0)
2 files modified
debian/changelog (+7/-0)
debian/tests/testsuite-live-python3 (+11/-0)
Reviewer Review Type Date Requested Status
git-ubuntu bot Approve
Bryce Harrington (community) Approve
Canonical Server Reporter Pending
Review via email: mp+459586@code.launchpad.net

Description of the change

Skip the testsuite-live-python3 test if:
- on ubuntu
- on armhf
- on container

The armhf container used in DEP8 tests in Ubuntu doesn't work well with this testsuite. The check that debian added to skip this test if seccomp filtering is already applied determines that there is no seccomp filtering in the ubuntu case, and the test proceeds, but it fails anyway. In debian it's being skipped. I tried troubleshooting this a while, but this became a rabbit hole, so I think this is the simplest workaround for now. This test wasn't being run in the past anyway, because it was flagged as isolation-machine, so it never ran in our armhf infra (nor in debian's).

PPA with amd64 and armhf: https://launchpad.net/~ahasenack/+archive/ubuntu/libseccomp-dep8-fix/

DEP8: green, showing testsuite-live-python3 was skipped on armhf:
305s autopkgtest [12:32:34]: test testsuite-live-python3: [-----------------------
307s Building scmp_api_level ...
307s Building scmp_arch_detect ...
307s Building scmp_sys_resolver ...
308s WARNING: Skipping this test on Ubuntu armhf LXD.
308s The way armhf LXD containers are setup prevents the test from completing.
308s See LP: #2051118 for details.
308s autopkgtest [12:32:37]: test testsuite-live-python3: -----------------------]
311s testsuite-live-python3 SKIP exit status 77 and marked as skippable

To post a comment you must log in.
Revision history for this message
Bryce Harrington (bryce) wrote :

LGTM, +1

I hadn't run across dpkg-vendor before, I may have to steal this technique for some of my armhf test flakers.

review: Approve
Revision history for this message
git-ubuntu bot (git-ubuntu-bot) wrote :

Approvers: ahasenack, bryce
Uploaders: ahasenack, bryce
MP auto-approved

review: Approve
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Thanks, uploaded

Uploading libseccomp_2.5.4-2ubuntu2.dsc
Uploading libseccomp_2.5.4-2ubuntu2.debian.tar.xz
Uploading libseccomp_2.5.4-2ubuntu2_source.buildinfo
Uploading libseccomp_2.5.4-2ubuntu2_source.changes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index f277627..15501d3 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+libseccomp (2.5.4-2ubuntu2) noble; urgency=medium
7+
8+ * d/t/testsuite-live-python3: skip this test if on a) armhf; b)
9+ ubuntu; c) lxd (LP: #2051118)
10+
11+ -- Andreas Hasenack <andreas@canonical.com> Fri, 26 Jan 2024 15:04:52 -0300
12+
13 libseccomp (2.5.4-2ubuntu1) noble; urgency=medium
14
15 * Merge with Debian; remaining changes:
16diff --git a/debian/tests/testsuite-live-python3 b/debian/tests/testsuite-live-python3
17index f4fb094..a4311f7 100644
18--- a/debian/tests/testsuite-live-python3
19+++ b/debian/tests/testsuite-live-python3
20@@ -4,6 +4,17 @@ set -eu
21
22 . debian/tests/common
23
24+arch=$(dpkg --print-architecture)
25+vendor=$(dpkg-vendor --query Vendor)
26+if [ "${arch}" = "armhf" ] && [ "${vendor}" = "Ubuntu" ]; then
27+ if systemd-detect-virt --container > /dev/null; then
28+ echo "WARNING: Skipping this test on Ubuntu armhf LXD."
29+ echo "The way armhf LXD containers are setup prevents the test from completing."
30+ echo "See LP: #2051118 for details."
31+ exit 77
32+ fi
33+fi
34+
35 # make sure "python" points to python3 as this is not configurable
36 # in the regression script
37 mkdir python3env

Subscribers

People subscribed via source and target branches