Merge ~racb/ubuntu-sponsoring:ubuntu-sponsors-reporter into ubuntu-sponsoring:main

[Robie Basak]

See commit message.

Do you want this to go into the develop branch first instead?

[Benjamin Drung (bdrung)]

Have you tested the change locally?

review: Needs Fixing

Unmerged commits

d149c0a... by Robie Basak on 2024-02-16

Add ~ubuntu-sponsors-reporter to SPONSOR_TEAMS

This will cause MPs for which ~ubuntu-sponsors-reporter has a review
slot (or a bug subscription, but we don't care about that) to also
appear in the sponsorship report.

I will also change the bot that auto-adds ~ubuntu-sponsors to add
~ubuntu-sponsors-reporter instead.

Sponsors will then be able to vote on MPs without "grabbing" the
~ubuntu-sponsors-reporter review slot (since they intentionally won't
belong to that team), and this way the MP won't disappear from the
sponsorship queue when that happens.

See
https://discourse.ubuntu.com/t/improving-the-git-ubuntu-based-sponsorship-workflow/37964
for further discussion.

diff --git a/sponsors-page b/sponsors-page
index 13bf542..44c24b3 100755
--- a/sponsors-page
+++ b/sponsors-page
@@ -33,7 +33,7 @@ EXTRA_TEAMS = {
 # Items against packages in b should go to a's page
 SETS = {"desktop-core": "ubuntu-desktop"}
 
-SPONSOR_TEAMS = {"general": "ubuntu-sponsors", "security": "ubuntu-security-sponsors"}
+SPONSOR_TEAMS = {"general": "ubuntu-sponsors", "ubuntu-sponsors-reporter", "security": "ubuntu-security-sponsors"}
 
 BLACKLISTED_REQUESTER = ("package-import",)