Merge ~juliank/britney/+git/britney2-ubuntu:consult-queued into ~ubuntu-release/britney/+git/britney2-ubuntu:master

[Julian Andres Klode]

Unmerged commits

92e0e3c... by Julian Andres Klode on 2024-03-25

WIP: Consult queued.json before queueing a test

If the test is already in the queue, do not send it again, even
if we did not know it was pending...

diff --git a/britney2/policies/autopkgtest.py b/britney2/policies/autopkgtest.py
index ac001c3..28d8b4f 100644
--- a/britney2/policies/autopkgtest.py
+++ b/britney2/policies/autopkgtest.py
@@ -167,6 +167,9 @@ class AutopkgtestPolicy(BasePolicy):
             else:
                 self.logger.info("Ignoring ADT_ARCHES %s as it is not in architectures list", arch)
 
+        with urlopen("https://autopkgtest.ubuntu.com/queued.json") as url:
+            self.queued = json.load(url)
+
     def fetch_db(self):
         f = None
         try:
@@ -1209,13 +1212,32 @@ class AutopkgtestPolicy(BasePolicy):
 
         self.request_test_if_not_queued(src, arch, trigger, full_triggers, huge=huge)
 
+    def test_in_queued(self, src, arch, trigger):
+        """Check if the test is in the queued.json from autopkgtest.ubuntu.com."""
+        for queue in self.queued["queues"]:
+            if queue not in ["ubuntu", "huge"]:
+                continue
+
+            for request in self.queued["queues"][queue][self.options.series][arch]["requests"]:
+                package, args = request.split(None, 1)
+                if package != src:
+                    continue
+
+                args = json.loads(args)
+                if trigger not in args["triggers"]:
+                    continue
+
+                return True
+
+        return False
+
     def request_test_if_not_queued(self, src, arch, trigger, full_triggers=[], huge=False):
         if not full_triggers:
             full_triggers = [trigger]
 
         # Don't re-request if it's already pending
         arch_list = self.pending_tests.setdefault(trigger, {}).setdefault(src, [])
-        if arch in arch_list:
+        if arch in arch_list or self.test_in_queued(src, arch, trigger):
             self.logger.info('Test %s/%s for %s is already pending, not queueing', src, arch, trigger)
         else:
             self.logger.info('Requesting %s autopkgtest on %s to verify %s', src, arch, trigger)