Merge ubuntu-archive-tools:rar-add-trigger into ubuntu-archive-tools:main

[Brian Murray]

This is useful if tests are failing with an unknown version because they require a specific newer version of a package from -proposed e.g. liblocale-gettext-perl during the noble development cycle. It's particularly helpful with the --run-autopkgtest argument as that command is harder to edit.

This also allows for a more targeted approach then all-proposed.

[Brian Murray (brian-murray)]

I tested this both with and without the `--run-autopkgtest` switch.

[Skia (hyask)]

Shouldn't that argument actually be an accumulator to allow specifying it multiple times?

review: Needs Information

[Paride Legovini (paride)]

I was going to suggest the same:

  parser.add_argument("--additional-trigger", action="append", ...)

then args.additional_trigger will be a list of additional triggers, specified by passing --additional-trigger one or more times.

However @Brian if you think this is not going to be useful in practice, I'm +1 for the proposed implementation.

9aa045d... by Brian Murray on 2024-01-26

retry-autopkgtest-regressions: allow for one or more triggers

f6a5fb7... by Brian Murray on 2024-01-26

retry-autopkgtest-regressions: also fix arguments for run-autopkgtest

[Brian Murray (brian-murray)]

I've modified the number of times you can call `--additional-trigger` per reviewer feedback.

[Graham Inggs (ginggs)]

I used this branch on the weekend to trigger perl autopkgtests with --additional-trigger and it worked well! Although, only tried with one additional trigger.

[Steve Langasek (vorlon)]

looks fine to me!

My only comment is that '--additional-trigger' is a quite a long name to have to type. Would it make sense to just call this '--trigger'?

review: Approve

[Brian Murray (brian-murray)]

retry-autopkgtest-regressions can already create a url with a trigger argument in it so we are adding another trigger but let's make the argument `--add-trigger`.

202fd22... by Brian Murray on 2024-01-31

Rename the argument add-trigger and save 7 characters

diff --git a/retry-autopkgtest-regressions b/retry-autopkgtest-regressions
index 859758a..f9b9f51 100755
--- a/retry-autopkgtest-regressions
+++ b/retry-autopkgtest-regressions
@@ -58,6 +58,8 @@ def parse_args():
                         help='Ubuntu series (default: %(default)s)')
     parser.add_argument('--all-proposed', action='store_true',
                         help='run tests against all of proposed, i. e. with disabling apt pinning')
+    parser.add_argument('--add-trigger', action='append',
+                        help='add trigger(s) with a $PKG/$VERSION combo')
     parser.add_argument('--state', default=[],
                         help='Generate commands for given test state (default: %(default)s). '
                         '--state=RUNNING also enables triggering already queued and running tests',
@@ -269,6 +271,9 @@ args = parse_args()
 extra_params = []
 if args.all_proposed:
     extra_params.append(('all-proposed', '1'))
+if args.add_trigger:
+    for add_trigger in args.add_trigger:
+        extra_params.append(('trigger', add_trigger))
 
 if args.log_regex:
     # expire old cache
@@ -313,6 +318,9 @@ for release, pkgmap in regressions.items():
                 url = request_url + '?' + urllib.parse.urlencode(params)
                 print(url)
             else:
+                if args.add_trigger:
+                    for add_trigger in args.add_trigger:
+                        triggers.append(add_trigger)
                 print("run-autopkgtest {allproposed}-s {release} -a {arch} {triggers} {pkg}".format(
                     allproposed='--all-proposed ' if args.all_proposed else '',
                     arch=arch,