Merge ~ubuntu-release/britney/+git/britney2-ubuntu:wip/autopkgtest-dont-block-risc-and-run-tests-when-we-can into ~ubuntu-release/britney/+git/britney2-ubuntu:master

[Iain Lane]

Various related changes to fix issues now we have an arch which is sadly not being tested

  - Don't block migration items when only non-adt arches are bad
  - Run tests when every adt arch is ready for them to be run

[Łukasz Zemczak (sil2100)]

Ok, this makes sense. The test cases also seem to cover the new cases. I included some nitpick stylistic things (in comments, so screw those!), but otherwise this looks good.

review: Approve

diff --git a/britney.conf b/britney.conf
index 09563b7..5daa041 100644
--- a/britney.conf
+++ b/britney.conf
@@ -29,7 +29,7 @@ STATE_DIR          = data/%(SERIES)/state
 # List of architectures that Britney should consider.
 # - defaults to the value in testing's Release file (if it is present).
 # - Required for the legacy layout.
-ARCHITECTURES     = amd64 arm64 armhf i386 powerpc ppc64el
+ARCHITECTURES     = amd64 arm64 armhf i386 powerpc ppc64el riscv64
 
 # if you're not in this list, arch: all packages are allowed to break on you
 NOBREAKALL_ARCHES = amd64
@@ -38,10 +38,10 @@ NOBREAKALL_ARCHES = amd64
 OUTOFSYNC_ARCHES  =
 
 # if you're in this list, your uninstallability count may increase
-BREAK_ARCHES      =
+BREAK_ARCHES      = riscv64
 
 # if you're in this list, you are a new architecture
-NEW_ARCHES        =
+NEW_ARCHES        = riscv64
 
 # priorities and delays
 MINDAYS_LOW       = 0
diff --git a/britney2/policies/autopkgtest.py b/britney2/policies/autopkgtest.py
index 1a93691..2741cfb 100644
--- a/britney2/policies/autopkgtest.py
+++ b/britney2/policies/autopkgtest.py
@@ -175,7 +175,15 @@ class AutopkgtestPolicy(BasePolicy):
     def apply_policy_impl(self, tests_info, suite, source_name, source_data_tdist, source_data_srcdist, excuse):
         # skip/delay autopkgtests until package is built
         binaries_info = self.britney.sources[suite][source_name]
-        if excuse.missing_builds or not binaries_info.binaries or 'depends' in excuse.reason:
+        unsat_deps = excuse.unsat_deps.copy()
+        non_adt_arches = set(self.options.architectures) - set(self.adt_arches)
+        interesting_missing_builds = set(excuse.missing_builds) - non_adt_arches
+        for arch in set(self.options.break_arches) | non_adt_arches:
+            try:
+                del unsat_deps[arch]
+            except KeyError:
+                pass
+        if interesting_missing_builds or not binaries_info.binaries or unsat_deps:
             self.log('%s has missing builds or is uninstallable, skipping autopkgtest policy' % excuse.name)
             return PolicyVerdict.REJECTED_TEMPORARILY
 
diff --git a/tests/__init__.py b/tests/__init__.py
index e08edc3..f28e510 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -13,7 +13,7 @@ import unittest
 
 PROJECT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-architectures = ['amd64', 'arm64', 'armhf', 'i386', 'powerpc', 'ppc64el']
+architectures = ['amd64', 'arm64', 'armhf', 'i386', 'powerpc', 'ppc64el', 'riscv64']
 
 
 class TestData:
@@ -37,7 +37,9 @@ class TestData:
         os.makedirs(self.dirs[False])
         os.mkdir(self.dirs[True])
         self.added_sources = {False: set(), True: set()}
-        self.added_binaries = {False: set(), True: set()}
+        self.added_binaries = {}
+        for arch in architectures:
+            self.added_binaries[arch] = {False: set(), True: set()}
 
         # pre-create all files for all architectures
         for arch in architectures:
@@ -75,10 +77,16 @@ class TestData:
         source record, based on fields['Source'] and name. In that case, the
         "Testsuite:" field is set to the testsuite argument.
         '''
-        assert (name not in self.added_binaries[unstable])
-        self.added_binaries[unstable].add(name)
-
         fields.setdefault('Architecture', 'all')
+        if fields['Architecture'] == 'all':
+            arches = architectures
+        else:
+            arches = [fields['Architecture']]
+
+        for a in arches:
+            assert (name not in self.added_binaries[a][unstable])
+            self.added_binaries[a][unstable].add(name)
+
         fields.setdefault('Version', '1')
         fields.setdefault('Priority', 'optional')
         fields.setdefault('Section', 'devel')
@@ -130,7 +138,8 @@ Maintainer: Joe <[e-mail]>
     def remove_all(self, unstable):
         '''Remove all added packages'''
 
-        self.added_binaries[unstable] = set()
+        for arch in self.added_binaries:
+            self.added_binaries[arch][unstable] = set()
         self.added_sources[unstable] = set()
         for a in architectures:
             open(os.path.join(self.dirs[unstable], 'Packages_' + a), 'w').close()
diff --git a/tests/test_autopkgtest.py b/tests/test_autopkgtest.py
index e4c2b49..2ca4a4f 100755
--- a/tests/test_autopkgtest.py
+++ b/tests/test_autopkgtest.py
@@ -29,7 +29,7 @@ apt_pkg.init()
 def tr(s):
     return {'custom_environment': ['ADT_TEST_TRIGGERS=%s' % s]}
 
-ON_ALL_ARCHES = {'on-architectures': ['amd64', 'arm64', 'armhf', 'i386', 'powerpc', 'ppc64el'],
+ON_ALL_ARCHES = {'on-architectures': ['amd64', 'arm64', 'armhf', 'i386', 'powerpc', 'ppc64el', 'riscv64'],
                  'on-unimportant-architectures': []}
 
 
@@ -52,6 +52,8 @@ class T(TestBase):
                 print('ADT_SWIFT_URL = http://localhost:18085')
             elif 'ADT_ARCHES' in line:
                 print('ADT_ARCHES = amd64 i386')
+            elif 'BREAK_ARCHES' in line:
+                print('BREAK_ARCHES = riscv64')
             else:
                 sys.stdout.write(line)
 
@@ -220,6 +222,149 @@ class T(TestBase):
         self.assertNotIn('accepted:', upgrade_out)
         self.assertIn('SUCCESS (0/0)', upgrade_out)
 
+    def test_no_request_for_uninstallable_break_arch_not_adt_arch(self):
+        '''Does not request a test for an uninstallable package if
+           uninstallable on a BREAK_ARCH which isn't in ADT_ARCHES, package
+           becomes a candidate'''
+
+        self.sourceppa_cache['pink'] = {'1': ''}
+        self.swift.set_results({'autopkgtest-series': {
+            'series/riscv64/p/pink/20150101_100000@': (0, 'pink 0.1', tr('pink/0.1'))
+        }})
+
+        self.data.add_src('pink', True, {'Version': '1', 'Testsuite': 'autopkgtest'})
+        self.data.add('pink',
+                      True,
+                      {'Version': '1',
+                       'Depends': 'libc6 (>= 0.9), libgreen1 (>= 2)',
+                       'Architecture': 'riscv64'},
+                      testsuite='autopkgtest',
+                      add_src=False)
+        exc = self.do_test(
+            # uninstallable unstable version on riscv64 (BREAK_ARCH) only
+            [],
+            {'pink': (True, {})}
+            )[1]
+
+        # autopkgtest should not be triggered since riscv64 is not in ADT_ARCHES
+        self.assertEqual(exc['pink']['policy_info']['autopkgtest'], {})
+        # we noticed the unsat dep
+        self.assertEqual(exc['pink']['dependencies']['unsatisfiable-dependencies'],
+                         {'riscv64': ['libgreen1 (>= 2)']})
+
+        self.assertEqual(self.pending_requests, {})
+        self.assertEqual(self.amqp_requests, set())
+
+        with open(os.path.join(self.data.path, 'output', 'series', 'output.txt')) as f:
+            upgrade_out = f.read()
+        self.assertIn('accepted: pink', upgrade_out)
+        self.assertIn('SUCCESS (1/0)', upgrade_out)
+
+    def test_tests_requested_when_non_adt_arch_is_blocking(self):
+        ''' When a package is uninstallable on an arch that isn't an ADT_ARCH,
+            we should still request tests (but the package should remain a
+            non-candidate unless it is in BREAK_ARCHES - see above test). '''
+        self.sourceppa_cache['pink'] = {'1': ''}
+        self.swift.set_results({'autopkgtest-series': {
+            'series/amd64/p/pink/20150101_100000@': (0, 'pink 0.1', tr('pink/0.1')),
+        }})
+
+        self.data.add_src('pink', True, {'Version': '1', 'Testsuite': 'autopkgtest'})
+        # amd64 is installable
+        self.data.add('pink',
+                      True,
+                      {'Version': '1',
+                       'Depends': 'libc6 (>= 0.9)',
+                       'Architecture': 'amd64'},
+                      testsuite='autopkgtest',
+                      add_src=False)
+        # ppc64el is not installable
+        self.data.add('pink',
+                      True,
+                      {'Version': '1',
+                       'Depends': 'libc6 (>= 0.9), libgreen1 (>= 2)',
+                       'Architecture': 'ppc64el'},
+                      testsuite='autopkgtest',
+                      add_src=False)
+        exc = self.do_test(
+            [],
+            {'pink': (False, {})}
+            )[1]
+
+        # we noticed the unsat dep
+        self.assertEqual(exc['pink']['dependencies']['unsatisfiable-dependencies'],
+                         {'ppc64el': ['libgreen1 (>= 2)']})
+
+        # but still requested the tests
+        self.assertEqual(self.pending_requests, {'pink/1': {'pink': ['amd64']}})
+        self.assertEqual(self.amqp_requests, set(['debci-series-amd64:pink {"triggers": ["pink/1"]}']))
+        self.assertEqual(exc['pink']['policy_info']['autopkgtest'],
+                {'pink': {'amd64': ['RUNNING',
+                                    'http://autopkgtest.ubuntu.com/running',
+                                    'http://autopkgtest.ubuntu.com/packages/p/pink/series/amd64',
+                                    None,
+                                    None]}})
+
+
+        with open(os.path.join(self.data.path, 'output', 'series', 'output.txt')) as f:
+            upgrade_out = f.read()
+        self.assertNotIn('accepted: pink', upgrade_out)
+        self.assertIn('SUCCESS (0/0)', upgrade_out)
+
+    def test_tests_requested_when_non_adt_arch_is_missing_build(self):
+        ''' When a package is unbuilt on an arch that isn't an ADT_ARCH,
+            we should still request tests (but the package should remain a
+            non-candidate unless it is in BREAK_ARCHES - see above test). '''
+        self.sourceppa_cache['pink'] = {'2': ''}
+        self.swift.set_results({'autopkgtest-series': {
+            'series/amd64/p/pink/20150101_100000@': (0, 'pink 1', tr('pink/1')),
+            'series/ppc64el/p/pink/20150101_100000@': (0, 'pink 1', tr('pink/1'))
+        }})
+
+        self.data.add('pink',
+                      False,
+                      {'Version': '1',
+                       'Depends': 'libc6 (>= 0.9)',
+                       'Architecture': 'amd64'},
+                      testsuite='autopkgtest')
+        self.data.add('pink',
+                      False,
+                      {'Version': '1',
+                       'Depends': 'libc6 (>= 0.9)',
+                       'Architecture': 'ppc64el'},
+                      testsuite='autopkgtest')
+        # built in unstable on amd64 only, so ppc64el is missing-build
+        self.data.add('pink',
+                      True,
+                      {'Version': '2',
+                       'Depends': 'libc6 (>= 0.9)',
+                       'Architecture': 'amd64'},
+                      testsuite='autopkgtest')
+        exc = self.do_test(
+            [],
+            {'pink': (False, {})}
+            )[1]
+
+        # we noticed the unsat dep
+        self.assertEqual(exc['pink']['missing-builds']['on-architectures'],
+                         ['ppc64el'])
+
+        # but still requested the tests
+        self.assertEqual(self.pending_requests, {'pink/2': {'pink': ['amd64']}})
+        self.assertEqual(self.amqp_requests, set(['debci-series-amd64:pink {"triggers": ["pink/2"]}']))
+        self.assertEqual(exc['pink']['policy_info']['autopkgtest'],
+                {'pink': {'amd64': ['RUNNING',
+                                    'http://autopkgtest.ubuntu.com/running',
+                                    'http://autopkgtest.ubuntu.com/packages/p/pink/series/amd64',
+                                    None,
+                                    None]}})
+
+
+        with open(os.path.join(self.data.path, 'output', 'series', 'output.txt')) as f:
+            upgrade_out = f.read()
+        self.assertNotIn('accepted: pink', upgrade_out)
+        self.assertIn('SUCCESS (0/0)', upgrade_out)
+
     def test_no_request_for_excluded_arch(self):
         '''
         Does not request a test on an architecture for which the package
@@ -737,7 +882,7 @@ class T(TestBase):
             [],
             {'green': (False, {})},
             {'green': [('old-version', '1'), ('new-version', '2'),
-                       ('missing-builds', {'on-architectures': ['amd64', 'arm64', 'armhf', 'powerpc', 'ppc64el'],
+                       ('missing-builds', {'on-architectures': ['amd64', 'arm64', 'armhf', 'powerpc', 'ppc64el', 'riscv64'],
                                            'on-unimportant-architectures': []})
                       ]
             })[1]
@@ -757,7 +902,7 @@ class T(TestBase):
             [],
             {'green': (False, {})},
             {'green': [('old-version', '1'), ('new-version', '2'),
-                       ('missing-builds', {'on-architectures': ['amd64', 'arm64', 'armhf', 'powerpc', 'ppc64el'],
+                       ('missing-builds', {'on-architectures': ['amd64', 'arm64', 'armhf', 'powerpc', 'ppc64el', 'riscv64'],
                                            'on-unimportant-architectures': []})
                       ]
             })[1]
@@ -2488,7 +2633,7 @@ class T(TestBase):
         exc = self.do_test(
             [('red', {'Version': '2'}, 'autopkgtest')],
             {'green': (False, {}), 'red': (False, {})},
-            {'green': [('missing-builds', {'on-architectures': ['amd64', 'arm64', 'armhf', 'powerpc', 'ppc64el'],
+            {'green': [('missing-builds', {'on-architectures': ['amd64', 'arm64', 'armhf', 'powerpc', 'ppc64el', 'riscv64'],
                                            'on-unimportant-architectures': []})],
              'red': [('reason', 'source-ppa')]}
         )[1]