Merge lp:~sil2100/ubuntu-archive-tools/remove-block-proposed-on-sru into lp:ubuntu-archive-tools

Proposed by Łukasz Zemczak
Status: Merged
Merged at revision: 1279
Proposed branch: lp:~sil2100/ubuntu-archive-tools/remove-block-proposed-on-sru
Merge into: lp:ubuntu-archive-tools
Diff against target: 17 lines (+7/-0)
1 file modified
sru_workflow.py (+7/-0)
To merge this branch: bzr merge lp:~sil2100/ubuntu-archive-tools/remove-block-proposed-on-sru
Reviewer Review Type Date Requested Status
Brian Murray Approve
Steve Langasek Needs Information
Review via email: mp+378917@code.launchpad.net

Commit message

Print a warning about whenever the block proposed tag is present on any of the bugs.

Description of the change

Remove the block-proposed-SERIES tag when accepting a new SRU. Sometimes we accept packages into -proposed and mark them block-proposed-SERIES to make sure they only get released with the next SRU. In this case I think it's safe to assume that if we accept a new SRU, we clear out the flags - at least from my experience that's 99% of the cases. Otherwise some bugs might be left as 'block-proposed' and not considered for release, even though they should be already.

To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) wrote :

Whether we leave or remove the tag we are making an assumption as to what the next SRU contains - something for updates or something to stay in proposed. Given that you've been more active on the SRU team than me I trust your experience and am fine with having the tag removed.

review: Approve
Revision history for this message
Steve Langasek (vorlon) wrote :

One concern I have with this is that there doesn't appear to be a single right answer about whether to keep or drop the tag, and the failure scenario from dropping the tag (accidentally releasing an SRU that wasn't meant to be released) is worse than the failure from leaving the tag (accidentally not noticing the SRU should be released).

Am I reading this wrong, or does this change mean that block-proposed tag the uploader has set on a bug prior to uploading an SRU will be automatically cleared as soon as that SRU has been accepted? That definitely seems wrong to me.

review: Needs Information
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

I think the best way to proceed and make all use-cases happy is to introduce a prompt for this. Let me prepare a proposition MP.

1276. By Łukasz Zemczak

Only print a warning message instead of removing the tag.

Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Ok, this is now ready for a re-review. So at first I thought of adding a prompt if the tag should be removed, but then I saw that we already only print out a message for the case of ubuntu-sponsors being subscribed. It felt to me that this is actually the same case. I guess printing out a warning here might also be a good compromise - what do you think?

Revision history for this message
Steve Langasek (vorlon) wrote :

On Fri, Feb 21, 2020 at 12:09:16PM -0000, Łukasz Zemczak wrote:

> Ok, this is now ready for a re-review. So at first I thought of adding a
> prompt if the tag should be removed, but then I saw that we already only
> print out a message for the case of ubuntu-sponsors being subscribed. It
> felt to me that this is actually the same case. I guess printing out a
> warning here might also be a good compromise - what do you think?

WFM in principle.

I haven't reviewed the actual code, so not +1ing the MP.

Revision history for this message
Brian Murray (brian-murray) wrote :

I looked at the actual code and I approve these changes.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'sru_workflow.py'
--- sru_workflow.py 2018-08-31 23:15:18 +0000
+++ sru_workflow.py 2020-02-20 15:24:29 +0000
@@ -74,6 +74,13 @@
74 'Is there anything left to sponsor?' % num)74 'Is there anything left to sponsor?' % num)
7575
76 if not sourcepkg or 'linux' not in sourcepkg:76 if not sourcepkg or 'linux' not in sourcepkg:
77 block_proposed_series = 'block-proposed-%s' % release
78 if block_proposed_series in bug.tags:
79 print('The %s tag is still set on bug LP: #%s. '
80 'Should the package continue to be blocked in proposed? '
81 'Please investigate and adjust the tags accordingly.'
82 % (block_proposed_series, num))
83
77 # this dance is needed due to84 # this dance is needed due to
78 # https://bugs.launchpad.net/launchpadlib/+bug/25490185 # https://bugs.launchpad.net/launchpadlib/+bug/254901
79 btags = bug.tags86 btags = bug.tags

Subscribers

People subscribed via source and target branches