Merge lp:~wgrant/launchpad/bug-538844-master-side into lp:launchpad

[William Grant]

Use the non-deprecated 'binarypackage' build slave when requesting builds of binary packages.

This branch just switches the build farm master to invoke binary package builds with the 'binarypackage' builder, rather than the deprecated and ambiguous 'debian'. See bug #538844 for a description of why we're doing this -- the production rollout of lp-buildd 59 has happened, so it's safe to do.

There appear to be no tests broken by this. There really should be some, but I'd like to wait for the model to settle down first. I've tested this locally with the production lp-buildd.

[Aaron Bentley (abentley)]

In general, please indicate what sort of preimplementation discussion happened. In this case, I can see that Julian triaged the bug, so I'll take that as an indication he agrees.

review: Approve

=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
--- lib/lp/buildmaster/tests/test_manager.py	2010-03-10 12:50:18 +0000
+++ lib/lp/buildmaster/tests/test_manager.py	2010-04-08 04:05:47 +0000
@@ -553,7 +553,7 @@
                '', '')),
              ('build',
               ('11-2',
-               'debian', '0feca720e2c29dafb2c900713ba560e03b758711',
+               'binarypackage', '0feca720e2c29dafb2c900713ba560e03b758711',
                {'alsa-utils_1.0.9a-4ubuntu1.dsc':
                 '4e3961baf4f56fdbc95d0dd47f3c5bc275da8a33'},
                {'arch_indep': True,

=== modified file 'lib/lp/soyuz/model/binarypackagebuildbehavior.py'
--- lib/lp/soyuz/model/binarypackagebuildbehavior.py	2010-03-31 02:15:04 +0000
+++ lib/lp/soyuz/model/binarypackagebuildbehavior.py	2010-04-08 04:05:47 +0000
@@ -71,7 +71,7 @@
 
         args = self._extraBuildArgs(self.build)
         status, info = self._builder.slave.build(
-            buildid, "debian", chroot_sha1, filemap, args)
+            buildid, "binarypackage", chroot_sha1, filemap, args)
         message = """%s (%s):
         ***** RESULT *****
         %s