Merge ~xnox/britney/+git/britney2-ubuntu:force-skiptest-all into ~ubuntu-release/britney/+git/britney2-ubuntu:master

[Dimitri John Ledkov]

force-skiptest: allow '/all' version specifier

Currently many kernels produce arch-all packages, and they seem to
trigger tests for many packages (hardcoded list + all dkms) on all
arches, even for kernels that do not exist on a given arch, or cannot
be tested.

At the moment this leads to a lot of test requests that are
impossible.

Add ability to specify a hint to prevent wiating on such
results. Specifically we currently need:

force-skiptest linux-meta-raspi/all
force-skiptest linux-meta-riscv/all
force-skiptest linux-meta-starfive/all

[Steve Langasek (vorlon)]

Our capacity to review and maintain delta from Debian here is limited. Since there is in principle nothing Ubuntu-specific about this extension to the hint syntax, please get this agreed with the Debian release team at https://salsa.debian.org/release-team/britney2 and we can cherry-pick it from there.

[Steve Langasek (vorlon)]

review: Needs Resubmitting

Unmerged commits

6be2106... by Dimitri John Ledkov on 2023-06-27

force-skiptest: allow '/all' version specifier

Currently many kernels produce arch-all packages, and they seem to
trigger tests for many packages (hardcoded list + all dkms) on all
arches, even for kernels that do not exist on a given arch, or cannot
be tested.

At the moment this leads to a lot of test requests that are
impossible.

Add ability to specify a hint to prevent wiating on such
results. Specifically we currently need:

force-skiptest linux-meta-raspi/all
force-skiptest linux-meta-riscv/all
force-skiptest linux-meta-starfive/all

Signed-off-by: Dimitri John Ledkov <email address hidden>

diff --git a/britney2/policies/autopkgtest.py b/britney2/policies/autopkgtest.py
index 546a03c..6606270 100644
--- a/britney2/policies/autopkgtest.py
+++ b/britney2/policies/autopkgtest.py
@@ -510,7 +510,8 @@ class AutopkgtestPolicy(BasePolicy):
 
         if verdict != PolicyVerdict.PASS:
             # check for force-skiptest hint
-            hints = self.hints.search('force-skiptest', package=source_name, version=source_data_srcdist.version)
+            hints = self.hints.search('force-skiptest', package=source_name, version=source_data_srcdist.version) +  \
+                self.hints.search('force-skiptest', package=source_name, version='all')
             if hints:
                 excuse.addreason('skiptest')
                 excuse.addinfo("Should wait for tests relating to %s %s, but forced by %s" %
diff --git a/tests/test_autopkgtest.py b/tests/test_autopkgtest.py
index 5c7bb72..825225a 100644
--- a/tests/test_autopkgtest.py
+++ b/tests/test_autopkgtest.py
@@ -2056,6 +2056,32 @@ class AT(TestAutopkgtestBase):
                        ('excuses', 'Should wait for tests relating to green 2, but forced by autopkgtest')]
              })
 
+    def test_hint_force_skiptest_versionall(self):
+        '''force-skiptest hint'''
+
+        self.data.add_default_packages(green=False)
+
+        self.create_hint('autopkgtest', 'force-skiptest green/all')
+
+        # regression of green, darkgreen ok, lightgreen running
+        self.set_results({'autopkgtest-testing': {
+            'testing/i386/g/green/20150101_100000@': (0, 'green 1', tr('passedbefore/1')),
+            'testing/i386/g/green/20150101_100200@': (4, 'green 2', tr('green/2')),
+            'testing/i386/d/darkgreen/20150101_100000@': (0, 'darkgreen 1', tr('green/2')),
+            'testing/amd64/d/darkgreen/20150101_100000@': (0, 'darkgreen 1', tr('green/2')),
+        }})
+        self.run_it(
+            [('libgreen1', {'Version': '2', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest')],
+            {'green': (True, {'green/2': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'REGRESSION'},
+                              'lightgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
+                              'darkgreen/1': {'amd64': 'PASS', 'i386': 'PASS'},
+                              }),
+             },
+            {'green': [('old-version', '1'), ('new-version', '2'),
+                       ('reason', 'skiptest'),
+                       ('excuses', 'Should wait for tests relating to green 2, but forced by autopkgtest')]
+             })
+
     def test_hint_force_skiptest_different_version(self):
         '''force-skiptest hint with non-matching version'''