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

Proposed by William Grant
Status: Merged
Approved by: Aaron Bentley
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~wgrant/launchpad/bug-538844-master-side
Merge into: lp:launchpad
Diff against target: 25 lines (+2/-2)
2 files modified
lib/lp/buildmaster/tests/test_manager.py (+1/-1)
lib/lp/soyuz/model/binarypackagebuildbehavior.py (+1/-1)
To merge this branch: bzr merge lp:~wgrant/launchpad/bug-538844-master-side
Reviewer Review Type Date Requested Status
Aaron Bentley (community) Approve
Review via email: mp+22681@code.launchpad.net

Commit message

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

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Aaron Bentley (abentley) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
2--- lib/lp/buildmaster/tests/test_manager.py 2010-03-10 12:50:18 +0000
3+++ lib/lp/buildmaster/tests/test_manager.py 2010-04-08 04:05:47 +0000
4@@ -553,7 +553,7 @@
5 '', '')),
6 ('build',
7 ('11-2',
8- 'debian', '0feca720e2c29dafb2c900713ba560e03b758711',
9+ 'binarypackage', '0feca720e2c29dafb2c900713ba560e03b758711',
10 {'alsa-utils_1.0.9a-4ubuntu1.dsc':
11 '4e3961baf4f56fdbc95d0dd47f3c5bc275da8a33'},
12 {'arch_indep': True,
13
14=== modified file 'lib/lp/soyuz/model/binarypackagebuildbehavior.py'
15--- lib/lp/soyuz/model/binarypackagebuildbehavior.py 2010-03-31 02:15:04 +0000
16+++ lib/lp/soyuz/model/binarypackagebuildbehavior.py 2010-04-08 04:05:47 +0000
17@@ -71,7 +71,7 @@
18
19 args = self._extraBuildArgs(self.build)
20 status, info = self._builder.slave.build(
21- buildid, "debian", chroot_sha1, filemap, args)
22+ buildid, "binarypackage", chroot_sha1, filemap, args)
23 message = """%s (%s):
24 ***** RESULT *****
25 %s