Merge ubuntu-archive-tools:skip-privates into ubuntu-archive-tools:main

[Brian Murray]

I was trying to use retry-autopkgtests with some stable releases and ran into some tracebacks trying to parse the json. This resolves those.

Traceback (most recent call last):
  File "/home/bdmurray/source-trees/ubuntu-archive-tools/ubuntu-archive-tools/./retry-autopkgtest-regressions", line 398, in <module>
    and already_triggered(release, arch, pkg, triggers,
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/bdmurray/source-trees/ubuntu-archive-tools/ubuntu-archive-tools/./retry-autopkgtest-regressions", line 224, in already_triggered
    running_triggers = params['triggers']
                       ~~~~~~^^^^^^^^^^^^
KeyError: 'triggers'

Traceback (most recent call last):
  File "/home/bdmurray/source-trees/ubuntu-archive-tools/ubuntu-archive-tools/./retry-autopkgtest-regressions", line 392, in <module>
    and already_triggered(release, arch, pkg, triggers,
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/bdmurray/source-trees/ubuntu-archive-tools/ubuntu-archive-tools/./retry-autopkgtest-regressions", line 191, in already_triggered
    item_params_json = json.loads(item_params_raw)
                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3.11/json/__init__.py", line 346, in loads
    return _default_decoder.decode(s)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3.11/json/decoder.py", line 337, in decode
    obj, end = self.raw_decode(s, idx=_w(s, 0).end())
               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3.11/json/decoder.py", line 355, in raw_decode
    raise JSONDecodeError("Expecting value", s, err.value) from None
json.decoder.JSONDecodeError: Expecting value: line 1 column 1 (char 0)

[Steve Langasek (vorlon)]

review: Approve

diff --git a/retry-autopkgtest-regressions b/retry-autopkgtest-regressions
index 60f7253..61056f4 100755
--- a/retry-autopkgtest-regressions
+++ b/retry-autopkgtest-regressions
@@ -129,6 +129,8 @@ def already_triggered(release, arch, pkg, triggers, extra_params, running, queue
                         m = re.search('([^ ^{]*) (.*)', queued_pkg)
                         queued_pkg = m.group(1)
                         item_params_raw = m.group(2)
+                    if queued_pkg == 'private':
+                        continue
                     item_params_json = json.loads(item_params_raw)
                     queued_triggers = item_params_json['triggers']
                     queued_extra_params = []
@@ -150,6 +152,8 @@ def already_triggered(release, arch, pkg, triggers, extra_params, running, queue
                     continue
                 for running_arch, running_params in arches.items():
                     params = running_params[0]
+                    if not params:
+                        continue
                     if not running_arch == arch:
                         continue
                     # upstream CI builds (systemd, ubuntu-image etc)