launchpad-reviewers team mailing list archive

[Martin Pool <mbp@xxxxxxxxxxxxx>]

Martin Pool has proposed merging lp:~mbp/launchpad/800295-buildd-split into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #800295 in Launchpad itself: "Some files in the Launchpad tree have surprisingly strict dependency requirements"
  https://bugs.launchpad.net/launchpad/+bug/800295

For more details, see:
https://code.launchpad.net/~mbp/launchpad/800295-buildd-split/+merge/81111

This is a partial fix for bug 800295, splitting all the files shared between buildd and lp proper into one or the other.

Beyond this we might like to split them in to separate trees, but I thought this would be easier to review and test by itself.

-- 
https://code.launchpad.net/~mbp/launchpad/800295-buildd-split/+merge/81111
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~mbp/launchpad/800295-buildd-split into lp:launchpad.

=== renamed file 'daemons/buildd-slave.tac' => 'lib/canonical/buildd/buildd-slave.tac'
--- daemons/buildd-slave.tac	2011-06-21 17:07:05 +0000
+++ lib/canonical/buildd/buildd-slave.tac	2011-11-03 06:41:24 +0000
@@ -2,11 +2,8 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 # XXX: JonathanLange 2011-06-21 bug=800295: The only modules in the Launchpad
-# tree that this is permitted to depend on are canonical.buildd and
-# canonical.launchpad.daemons.readyservice, since canonical.buildd is deployed
-# by copying lib/canonical/buildd,
-# lib/canonical/launchpad/daemons/readyservice.py and daemons/buildd-slave.tac
-# only.
+# tree that this is permitted to depend on are canonical.buildd and since
+# canonical.buildd is deployed by copying lib/canonical/buildd only.
 
 # Buildd Slave implementation
 # XXX: dsilvers: 2005/01/21: Currently everything logged in the slave gets
@@ -19,7 +16,6 @@
     SourcePackageRecipeBuildManager)
 from canonical.buildd.translationtemplates import (
     TranslationTemplatesBuildManager)
-from canonical.launchpad.daemons import readyservice
 
 from twisted.web import server, resource, static
 from ConfigParser import SafeConfigParser
@@ -42,9 +38,6 @@
 application = service.Application('BuildDSlave')
 builddslaveService = service.IServiceCollection(application)
 
-# Service that announces when the daemon is ready
-readyservice.ReadyService().setServiceParent(builddslaveService)
-
 root = resource.Resource()
 root.putChild('rpc', slave)
 root.putChild('filecache', static.File(conf.get('slave', 'filecache')))

=== modified file 'lib/canonical/buildd/debian/changelog'
--- lib/canonical/buildd/debian/changelog	2011-10-17 13:12:47 +0000
+++ lib/canonical/buildd/debian/changelog	2011-11-03 06:41:24 +0000
@@ -1,3 +1,9 @@
+launchpad-buildd (82) hardy-cat; urgency=low
+
+  * Cut out readyservice from the buildds.  LP: #800295
+
+ -- Martin Pool <mbp@xxxxxxxxxxxxx>  Thu, 03 Nov 2011 17:11:25 +1100
+
 launchpad-buildd (81) hardy-cat; urgency=low
 
   * generate-translation-templates: switch to Python 2.7.

=== modified file 'lib/canonical/buildd/debian/rules'
--- lib/canonical/buildd/debian/rules	2010-10-20 18:43:29 +0000
+++ lib/canonical/buildd/debian/rules	2011-11-03 06:41:24 +0000
@@ -14,7 +14,6 @@
 target = debian/launchpad-buildd
 topdir = ../../..
 
-daemons = $(topdir)/daemons
 buildd = $(topdir)/lib/canonical/buildd
 
 targetshare = $(target)/usr/share/launchpad-buildd
@@ -45,8 +44,7 @@
 	# Do installs here
 	touch $(pytarget)/../launchpad/__init__.py
 	touch $(pytarget)/../launchpad/daemons/__init__.py
-	cp launchpad-files/readyservice.py $(pytarget)/../launchpad/daemons/
-	install -m644 launchpad-files/buildd-slave.tac $(targetshare)/buildd-slave.tac
+	install -m644 buildd-slave.tac $(targetshare)/buildd-slave.tac
 	cp -r pottery $(pytarget)
 	for pyfile in $(pyfiles); do \
 	  install -m644 ./$$pyfile $(pytarget)/$$pyfile; \
@@ -90,8 +88,6 @@
 	dh_clean
 
 prepare:
-	install -m644 $(daemons)/buildd-slave.tac launchpad-files/buildd-slave.tac
-	cp ../launchpad/daemons/readyservice.py launchpad-files/readyservice.py
 
 package: prepare
 	debuild -uc -us -S