Merge ~ubuntu-release/autopkgtest/+git/development:cross-arch-architecture-filtering into ~ubuntu-release/autopkgtest/+git/development:master

[Steve Langasek]

[Lukas Märdian (slyon)]

FTR: The failure was introduced by this change in Debian:
https://salsa.debian.org/debian/libgpg-error/-/commit/0c11fe4ae16c2800e13758ff1ee64c561354e628

It started to fail for i386 on autopkgtest.u.c:
https://autopkgtest.ubuntu.com/packages/libgpg-error/kinetic/i386
https://autopkgtest.ubuntu.com/results/autopkgtest-kinetic/kinetic/i386/libg/libgpg-error/20220523_114919_e3142@/log.gz

The relevant log is this:
```
The following packages have unmet dependencies:
 builddeps:/tmp/autopkgtest.VMjBik/1-autopkgtest-satdep.dsc:i386 : Depends: gcc-mingw-w64-x86-64:i386 but it is not installable
E: Unable to correct problems, you have held broken packages.
win64 FAIL badpkg
[...]
autopkgtest [11:49:03]: @@@@@@@@@@@@@@@@@@@@ summary
win32 SKIP Test lists explicitly supported architectures, but the current architecture amd64 isn't listed.
win64 FAIL badpkg
blame: libgpg-error
badpkg: Test dependencies are unsatisfiable. A common reason is that your testbed is out of date with respect to the archive, and you need to use a current testbed or run apt-get update or use -U.
build PASS
```

As can be seen, the i386/win32 test is skipped while amd64/win64 is executed and fails with "badpkg" error due to not being able to install "gcc-mingw-w64-x86-64:i386".

[Lukas Märdian (slyon)]

I think the fix is not broad enough, as it only adopts for cross_arch testbed if d/control defines the "Tests:" stanza, but not for the "Test-Command:" stanza, which is being used for libgpg-error.

So running the libgpg-error test on this branch of autopkgtest still fails the same way. This should be fixed by the following patch:
https://paste.ubuntu.com/p/c56ppVD4s3/

review: Needs Fixing

[Lukas Märdian (slyon)]

I think the patch pasted above should fix the root-cause in autopkgtest, but unfortunately, the libgpg-error/i386 test still fails. Now that the "win64" test is skipped and "win32" executed, "win32" fails with a "badpkg" error, which probably needs solving in the archive.

$ PYTHONPATH=lib/ runner/autopkgtest libgpg-error --apt-pocket=proposed=src:libgpg-error -a i386 -U -- qemu /data/autopkgtest-kinetic-amd64.img
[...]
win64 SKIP Test lists explicitly supported architectures, but the current architecture i386 isn't listed.
[...]
The following packages have unmet dependencies:
 builddeps:/tmp/autopkgtest.8Maso6/1-autopkgtest-satdep.dsc:i386 : Depends: gcc-mingw-w64-i686:i386 but it is not installable
                                                                   Depends: wine32:i386 but it is not going to be installed
E: Unable to correct problems, you have held broken packages.
win32 FAIL badpkg
blame: libgpg-error
badpkg: Test dependencies are unsatisfiable. A common reason is that your testbed is out of date with respect to the archive, and you need to use a current testbed or run apt-get update or use -U.

Full log: https://paste.ubuntu.com/p/JYHrJpMGbn/

[Steve Langasek (vorlon)]

thanks, have included your fix for the Test-Command: case.

diff --git a/lib/testdesc.py b/lib/testdesc.py
index c8c9741..c0ac486 100644
--- a/lib/testdesc.py
+++ b/lib/testdesc.py
@@ -606,6 +606,11 @@ def parse_debian_source(srcdir, testbed_caps, testbed_arch, control_path=None,
             architectures = record.get('Architecture', '').replace(
                 ',', ' ').split()
 
+            if cross_arch:
+                target_arch = cross_arch
+            else:
+                target_arch = testbed_arch
+
             if 'Tests' in record:
                 test_names = record['Tests'].replace(',', ' ').split()
                 if len(test_names) == 0:
@@ -626,7 +631,7 @@ def parse_debian_source(srcdir, testbed_caps, testbed_arch, control_path=None,
                 for n in test_names:
                     try:
                         _debian_check_unknown_fields(n, record)
-                        _check_architecture(n, testbed_arch, architectures)
+                        _check_architecture(n, target_arch, architectures)
 
                         test = Test(n, os.path.join(test_dir, n), None,
                                     restrictions, features, depends, [], [], synth_depends)
@@ -650,7 +655,7 @@ def parse_debian_source(srcdir, testbed_caps, testbed_arch, control_path=None,
                 else:
                     name = feature_test_name
                 _debian_check_unknown_fields(name, record)
-                _check_architecture(name, testbed_arch, architectures)
+                _check_architecture(name, target_arch, architectures)
                 test = Test(name, None, command, restrictions, features,
                             depends, [], [], synth_depends)
                 test.check_testbed_compat(testbed_caps, ignore_restrictions)