Merge lp:~brian-murray/ubuntu-archive-tools/block-proposed into lp:ubuntu-archive-tools

[Brian Murray]

Let's use code to prevent human error.

[Steve Langasek (vorlon)]

block-proposed bugs are not customarily the bugs that are referenced in the changelog for the version that was uploaded. Shouldn't this either look at the verification-failed tags, or else scan all bugs on the package for the block-proposed tag?

review: Needs Information

[Brian Murray (brian-murray)]

> block-proposed bugs are not customarily the bugs that are referenced in the
> changelog for the version that was uploaded. Shouldn't this either look at
> the verification-failed tags, or else scan all bugs on the package for the
> block-proposed tag?

The code actually checks for block-proposed-$release and that tag is used on bugs that are referenced in the changelog. It should also check for verification-failed and I'll that too.

[lp:~brian-murray/ubuntu-archive-tools/block-proposed]

1432. By Brian Murray on 2021-01-27

Also prevent releasing SRUs with verification-failed-$release

[Steve Langasek (vorlon)]

> The code actually checks for block-proposed-$release and
> that tag is used on bugs that are referenced in the changelog.

The point I was trying to make is that we are meant to be able to file bugs after the upload, use the block-proposed* tags, and have that block release of the package.

However, this is already done by britney so once we transition sru-release to write hints instead of releasing directly, it doesn't need to be handled in sru-release at all.

So I'm fine to go forward with this MP as-is.

review: Approve

=== modified file 'sru-release'
--- sru-release	2020-01-29 04:02:26 +0000
+++ sru-release	2021-01-27 22:30:32 +0000
@@ -249,6 +249,25 @@
             sys.stderr.write(message)
             sys.exit(1)
 
+        # If any bug is tagged 'block-proposed' prevent releasing the update.
+        for pkg_versions in pkg_versions_map.values():
+            for pkg, versions in pkg_versions.items():
+                sru_bugs = match_srubugs(options, versions['changesfile'])
+                block_tag = 'block-proposed-%s' % release
+                failed_tag = 'verification-failed-%s' % release
+                for sru_bug in sru_bugs:
+                    if block_tag in sru_bug.tags:
+                        message = ('ERROR: not releasing ' + pkg + ' as SRU '
+                                   'bug ' + str(sru_bug.id) + ' is tagged '
+                                   + block_tag + '\n')
+                    elif failed_tag in sru_bug.tags:
+                        message = ('ERROR: not releasing ' + pkg + ' as SRU '
+                                   'bug ' + str(sru_bug.id) + ' is tagged '
+                                   + failed_tag + '\n')
+                    if message:
+                        sys.stderr.write(message)
+                        sys.exit(1)
+
         for pkg, versions in pkg_versions_map[package].items():
             print('--- Releasing %s ---' % pkg)
             print('Proposed: %s' % versions['proposed'])