Merge lp:~wgrant/launchpad/bug-565739-dont-retry-superseded-builds into lp:launchpad

[William Grant]

buildd-mass-retry.py will no longer retry superseded builds.

See bug #565739 for the problem. This branch just skips builds if their current_source_publication is None, which indicates that their source is superseded or deleted (the same check as buildd-manager uses). I don't think there's much point in logging this condition, as it is very normal.

There is no lint.

[Robert Collins (lifeless)]

On logging, I thinks worth logging, but at a quiet level not normally
output. Making it possible to debug things is good :)

[Gavin Panella (allenap)]

What Robert said :)

review: Needs Fixing

[William Grant (wgrant)]

Pfft, everyone knows that Soyuz isn't meant to be debuggable by mortal beings.

But fixed.

[Gavin Panella (allenap)]

review: Approve

=== modified file 'lib/lp/soyuz/doc/buildd-mass-retry.txt'
--- lib/lp/soyuz/doc/buildd-mass-retry.txt	2010-04-14 17:34:35 +0000
+++ lib/lp/soyuz/doc/buildd-mass-retry.txt	2010-04-21 11:17:25 +0000
@@ -47,6 +47,45 @@
   INFO    Dry-run.
   <BLANKLINE>
 
+Superseded builds won't be retried; buildd-manager will just skip the build
+and set it to SUPERSEDED.
+
+  >>> from zope.security.proxy import removeSecurityProxy
+  >>> from lp.soyuz.interfaces.binarypackagebuild import (
+  ...     IBinaryPackageBuildSet)
+  >>> from lp.soyuz.interfaces.publishing import PackagePublishingStatus
+  >>> build = getUtility(IBinaryPackageBuildSet).getByBuildID(12)
+  >>> pub = removeSecurityProxy(build.current_source_publication)
+
+Let's mark the build from the previous run superseded.
+
+  >>> pub.status = PackagePublishingStatus.SUPERSEDED
+  >>> print build.current_source_publication
+  None
+  >>> transaction.commit()
+
+A new run doesn't pick it up.
+
+  >>> process = subprocess.Popen([sys.executable, script, "-v", "-NFDC",
+  ...                             "-s", "hoary"],
+  ...                            stdout=subprocess.PIPE,
+  ...                            stderr=subprocess.PIPE,)
+  >>> stdout, stderr = process.communicate()
+  >>> process.returncode
+  0
+  >>> print stderr
+  DEBUG   Intitialising connection.
+  INFO    Initialising Build Mass-Retry for 'The Hoary Hedgehog Release/RELEASE'
+  INFO    Processing builds in 'Failed to build'
+  INFO    Processing builds in 'Dependency wait'
+  DEBUG   Skipping superseded i386 build of libstdc++ b8p in ubuntu hoary RELEASE (12)
+  INFO    Processing builds in 'Chroot problem'
+  INFO    Success.
+  INFO    Dry-run.
+  <BLANKLINE>
+
+  >>> pub.status = PackagePublishingStatus.PUBLISHED
+  >>> transaction.commit()
 
 Passing an architecture, which contains no failed build records,
 nothing is done:

=== modified file 'scripts/ftpmaster-tools/buildd-mass-retry.py'
--- scripts/ftpmaster-tools/buildd-mass-retry.py	2010-03-19 21:26:13 +0000
+++ scripts/ftpmaster-tools/buildd-mass-retry.py	2010-04-21 11:17:25 +0000
@@ -121,6 +121,12 @@
             build_state=target_state, pocket=pocket)
 
         for build in target_builds:
+            # Skip builds for superseded sources; they won't ever
+            # actually build.
+            if not build.current_source_publication:
+                log.debug(
+                    'Skipping superseded %s (%s)' % (build.title, build.id))
+                continue
 
             if not build.can_be_retried:
                 log.warn('Can not retry %s (%s)' % (build.title, build.id))