Merge lp:~michael.nelson/launchpad/567922-binarypackagebuild-packagebuild-4 into lp:launchpad/db-devel

[Michael Nelson]

This branch is part of a pipeline for

https://blueprints.edge.launchpad.net/soyuz/+spec/build-generalisation
https://dev.launchpad.net/LEP/GeneralBuildHistories

Overview
========
The changes in this branch just do a bit of cleaning up after the refactoring of the past 3 branches.

The previous 3 branches added all the IBuildBase attributes and methods to IBuildFarmJob/IPackageJob in preparation for switching our build infrastructure to the new build tables (similar, but not exactly like http://people.ubuntu.com/~wgrant/launchpad/buildfarm/new-build-model-again.png)

This branch does some retrospective cleaning up.

Details
=======
The previous branches update the IBuildFarmJob as planned so that new database-backed BuildFarmJob/PackageBuild objects can be created and tested while still ensuring that existing classes that use IBuildFarmJob implementations and expect them to be non-database objects providing functionality still pass their tests. But it was getting complicated to see these two different ways in which IBuildFarmJob was expected to behave (see has_concrete_build_farm_job that is removed in this branch).

So, to simplify the ongoing refactoring work, I split out IBuildFarmJobOld from IBuildFarmJob, where IBuildFarmJobOld is the exact interface that existing classes currently expect, while IBuildFarmJob is a superset representing the new database-backed objects. I also added a note in the BRANCH.TODO that these *Old classes will be removed before the branch is landed.

This allowed IBuildFarmJob and IPackageBuild to be simplified, as they no longer need to worry about whether they are representing a database-backed object or not.

This branch is dependent on the pending schema patch in a previous branch.

To test
=======

First update the test db schema (required as the db patch still needs to be updated to remove the old build table):
psql launchpad_ftest_template -f database/schema/pending/michaeln-build-generalisation.sql
bin/py database/schema/security.py -d launchpad_ftest_template

And then either:
bin/test -vvt test_*build (lots of tests), or for a quicker run:
bin/test -vvt test_packagebuild -t test_buildfarmjob -t doc/build.txt -t test_buildqueue -t test_sourcepackagerecipebuild -t test_buildpackagejob -t test_buildbase

(there is one intentional test failure in test_buildfarmjob for a method that can't be implemented until I switch BinaryPackageBuild to the new delegation model of IPackageBuild/IBuildFarmJob).

The next branch will (finally) the work to switch BinaryPackageBuild from the old build table to the new buildfarmjob/packagebuild/binarypackagebuild tables.

[Abel Deuring (adeuring)]

review: Approve (code)

=== modified file 'BRANCH.TODO'
--- BRANCH.TODO	2010-05-05 15:48:49 +0000
+++ BRANCH.TODO	2010-05-05 15:48:52 +0000
@@ -2,6 +2,12 @@
 # landing. There is a test to ensure it is empty in trunk. If there is
 # stuff still here when you are ready to land, the items should probably
 # be converted to bugs so they can be scheduled.
+The following temporary classes need to be removed before this branch can
+land:
+  * BuildFarmJobOld/IBuildFarmJobOld (update the classes using this to
+    use the new db versions).
+  * BuildFarmJobOldDerived (move queue-methods onto BuildFarmJobDerived).
+  * BuildBase.
 
 The static methods on IBuildFarmJob/IPackageBuild should be reverted
 to normal methods once all *Build classes have transitioned to the new
 
=== modified file 'lib/lp/buildmaster/interfaces/buildfarmjob.py'
--- lib/lp/buildmaster/interfaces/buildfarmjob.py	2010-05-05 15:48:49 +0000
+++ lib/lp/buildmaster/interfaces/buildfarmjob.py	2010-05-05 15:48:52 +0000
@@ -9,6 +9,7 @@
 
 __all__ = [
     'IBuildFarmJob',
+    'IBuildFarmJobOld',
     'IBuildFarmJobSource',
     'IBuildFarmJobDerived',
     'BuildFarmJobType',
@@ -59,11 +60,18 @@
         """)
 
 
-class IBuildFarmJob(Interface):
-    """Operations that jobs for the build farm must implement."""
-
-    id = Attribute('The build farm job ID.')
-
+class IBuildFarmJobOld(Interface):
+    """Defines the previous non-database BuildFarmJob interface.
+
+    This interface is still used by the temporary build queue related
+    classes (TranslationTemplatesBuildJob, SourcePackageRecipeBuildJob
+    and BuildPackageJob).
+
+    XXX 2010-04-28 michael.nelson bug=567922
+    This class can be removed (merging all the attributes directly into
+    IBuildFarmJob) once all the corresponding *Build classes and the
+    BuildQueue have been transitioned to the new database schema.
+    """
     processor = Reference(
         IProcessor, title=_("Processor"), required=False, readonly=True,
         description=_(
@@ -77,6 +85,33 @@
             "This should be None for job types that do not care whether "
             "they run virtualized."))
 
+    def score():
+        """Calculate a job score appropriate for the job type in question."""
+
+    def getLogFileName():
+        """The preferred file name for this job's log."""
+
+    def getName():
+        """An appropriate name for this job."""
+
+    def getTitle():
+        """A string to identify and describe the job to users."""
+
+    def jobStarted():
+        """'Job started' life cycle event, handle as appropriate."""
+
+    def jobReset():
+        """'Job reset' life cycle event, handle as appropriate."""
+
+    def jobAborted():
+        """'Job aborted' life cycle event, handle as appropriate."""
+
+
+class IBuildFarmJob(IBuildFarmJobOld):
+    """Operations that jobs for the build farm must implement."""
+
+    id = Attribute('The build farm job ID.')
+
     date_created = exported(
         Datetime(
             title=_("Date created"), required=True, readonly=True,
@@ -142,37 +177,8 @@
         vocabulary=BuildFarmJobType,
         description=_("The specific type of job."))
 
-    # XXX 2010-04-21 michael.nelson bug=567922. This property
-    # can be removed once all *Build classes use the concrete
-    # BuildFarmJob.
-    has_concrete_build_farm_job = Bool(
-        title=_('Has concrete build farm job'), required=False,
-        readonly=True, description=_(
-            'Whether this instance is or has a concrete build farm job.'))
-
     title = exported(TextLine(title=_("Title"), required=False))
 
-    def score():
-        """Calculate a job score appropriate for the job type in question."""
-
-    def getLogFileName():
-        """The preferred file name for this job's log."""
-
-    def getName():
-        """An appropriate name for this job."""
-
-    def getTitle():
-        """A string to identify and describe the job to users."""
-
-    def jobStarted():
-        """'Job started' life cycle event, handle as appropriate."""
-
-    def jobReset():
-        """'Job reset' life cycle event, handle as appropriate."""
-
-    def jobAborted():
-        """'Job aborted' life cycle event, handle as appropriate."""
-
     def makeJob():
         """Create the specific job relating this with an lp.services.job.
 
 
=== modified file 'lib/lp/buildmaster/model/buildfarmjob.py'
--- lib/lp/buildmaster/model/buildfarmjob.py	2010-05-05 15:48:49 +0000
+++ lib/lp/buildmaster/model/buildfarmjob.py	2010-05-05 15:48:52 +0000
@@ -5,6 +5,8 @@
 __all__ = [
     'BuildFarmJob',
     'BuildFarmJobDerived',
+    'BuildFarmJobOld',
+    'BuildFarmJobOldDerived',
     ]
 
 
@@ -15,7 +17,6 @@
 import hashlib
 import pytz
 
-from storm.info import get_obj_info
 from storm.locals import Bool, DateTime, Int, Reference, Storm
 from storm.store import Store
 
@@ -32,13 +33,116 @@
 from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.buildfarmjob import (
     BuildFarmJobType, IBuildFarmJob, IBuildFarmJobDerived,
-    IBuildFarmJobSource)
+    IBuildFarmJobOld, IBuildFarmJobSource)
 from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
 
 
-class BuildFarmJob(Storm):
+class BuildFarmJobOld:
+    """See `IBuildFarmJobOld`."""
+    implements(IBuildFarmJobOld)
+    processor = None
+    virtualized = None
+
+    def score(self):
+        """See `IBuildFarmJobOld`."""
+        raise NotImplementedError
+
+    def getLogFileName(self):
+        """See `IBuildFarmJobOld`."""
+        return 'buildlog.txt'
+
+    def getName(self):
+        """See `IBuildFarmJobOld`."""
+        raise NotImplementedError
+
+    def getTitle(self):
+        """See `IBuildFarmJobOld`."""
+        raise NotImplementedError
+
+    def makeJob(self):
+        """See `IBuildFarmJobOld`."""
+        raise NotImplementedError
+
+    def jobStarted(self):
+        """See `IBuildFarmJobOld`."""
+        pass
+
+    def jobReset(self):
+        """See `IBuildFarmJobOld`."""
+        pass
+
+    def jobAborted(self):
+        """See `IBuildFarmJobOld`."""
+        pass
+
+
+class BuildFarmJobOldDerived:
+    delegates(IBuildFarmJobOld, context='build_farm_job')
+
+    def __init__(self, *args, **kwargs):
+        """Ensure the instance to which we delegate is set on creation."""
+        self._set_build_farm_job()
+        super(BuildFarmJobOldDerived, self).__init__(*args, **kwargs)
+
+    def __storm_loaded__(self):
+        """Set the attribute for our IBuildFarmJob delegation.
+
+        This is needed here as __init__() is not called when a storm object
+        is loaded from the database.
+        """
+        self._set_build_farm_job()
+
+    def _set_build_farm_job(self):
+        """Set the build farm job to which we will delegate.
+
+        Deriving classes must set the build_farm_job attribute for the
+        delegation.
+        """
+        raise NotImplementedError
+
+    @classmethod
+    def getByJob(cls, job):
+        """See `IBuildFarmJobDerived`."""
+        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
+        return store.find(cls, cls.job == job).one()
+
+    @staticmethod
+    def addCandidateSelectionCriteria(processor, virtualized):
+        """See `IBuildFarmJobDerived`."""
+        return ('')
+
+    @staticmethod
+    def postprocessCandidate(job, logger):
+        """See `IBuildFarmJobDerived`."""
+        return True
+
+    def generateSlaveBuildCookie(self):
+        """See `IBuildFarmJobDerived`."""
+        buildqueue = getUtility(IBuildQueueSet).getByJob(self.job)
+
+        if buildqueue.processor is None:
+            processor = '*'
+        else:
+            processor = repr(buildqueue.processor.id)
+
+        contents = ';'.join([
+            repr(removeSecurityProxy(self.job).id),
+            self.job.date_created.isoformat(),
+            repr(buildqueue.id),
+            buildqueue.job_type.name,
+            processor,
+            self.getName(),
+            ])
+
+        return hashlib.sha1(contents).hexdigest()
+
+    def cleanUp(self):
+        """See `IBuildFarmJob`."""
+        Store.of(self).remove(self)
+
+
+class BuildFarmJob(BuildFarmJobOld, Storm):
     """A base implementation for `IBuildFarmJob` classes."""
-
     __storm_table__ = 'BuildFarmJob'
 
     implements(IBuildFarmJob)
@@ -76,6 +180,7 @@
 
     def __init__(self, job_type, status=BuildStatus.NEEDSBUILD,
                  processor=None, virtualized=None):
+        super(BuildFarmJob, self).__init__()
         self.job_type, self.status, self.process, self.virtualized = (
             job_type,
             status,
@@ -95,40 +200,16 @@
         return build_farm_job
 
     @property
-    def has_concrete_build_farm_job(self):
-        """See `IBuildFarmJob`."""
-        # Check if the object has been added to the store.
-        return get_obj_info(self).get('store') is not None
-
-    @property
     def title(self):
         """See `IBuildFarmJob`."""
         return self.job_type.title
 
-    def score(self):
-        """See `IBuildFarmJob`."""
-        raise NotImplementedError
-
-    def getLogFileName(self):
-        """See `IBuildFarmJob`."""
-        return 'buildlog.txt'
-
-    def getName(self):
-        """See `IBuildFarmJob`."""
-        raise NotImplementedError
-
-    def getTitle(self):
-        """See `IBuildFarmJob`."""
-        raise NotImplementedError
-
     def makeJob(self):
         """See `IBuildFarmJob`."""
         raise NotImplementedError
 
     def jobStarted(self):
         """See `IBuildFarmJob`."""
-        if not self.has_concrete_build_farm_job:
-            return
         self.status = BuildStatus.BUILDING
         # The build started, set the start time if not set already.
         self.date_started = UTC_NOW
@@ -137,8 +218,6 @@
 
     def jobReset(self):
         """See `IBuildFarmJob`."""
-        if not self.has_concrete_build_farm_job:
-            return
         self.status = BuildStatus.NEEDSBUILD
         self.date_started = None
 
@@ -186,70 +265,3 @@
     """See `IBuildFarmJobDerived`."""
     implements(IBuildFarmJobDerived)
     delegates(IBuildFarmJob, context='build_farm_job')
-
-    def __init__(self, *args, **kwargs):
-        """Ensure the instance to which we delegate is set on creation."""
-        self._set_build_farm_job()
-        super(BuildFarmJobDerived, self).__init__(*args, **kwargs)
-
-    def __storm_loaded__(self):
-        """Set the attribute for our IBuildFarmJob delegation.
-
-        This is needed here as __init__() is not called when a storm object
-        is loaded from the database.
-        """
-        self._set_build_farm_job()
-
-    def _set_build_farm_job(self):
-        """Set the default build farm job to which we will delegate.
-
-        Sub-classes should override as required.
-
-        XXX 2010-04-27 michael.nelson bug=570939
-        This only exists because certain classes assume that
-        BuildFarmJob/PackageBuild are in-memory objects that simply
-        provide methods to update the associated builds.
-        We can remove it once the above bug is completed.
-        """
-        self.build_farm_job = BuildFarmJob(
-            job_type=BuildFarmJobType.PACKAGEBUILD)
-
-    @classmethod
-    def getByJob(cls, job):
-        """See `IBuildFarmJobDerived`."""
-        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
-        return store.find(cls, cls.job == job).one()
-
-    @staticmethod
-    def addCandidateSelectionCriteria(processor, virtualized):
-        """See `IBuildFarmJobDerived`."""
-        return ('')
-
-    @staticmethod
-    def postprocessCandidate(job, logger):
-        """See `IBuildFarmJobDerived`."""
-        return True
-
-    def generateSlaveBuildCookie(self):
-        """See `IBuildFarmJobDerived`."""
-        buildqueue = getUtility(IBuildQueueSet).getByJob(self.job)
-
-        if buildqueue.processor is None:
-            processor = '*'
-        else:
-            processor = repr(buildqueue.processor.id)
-
-        contents = ';'.join([
-            repr(removeSecurityProxy(self.job).id),
-            self.job.date_created.isoformat(),
-            repr(buildqueue.id),
-            buildqueue.job_type.name,
-            processor,
-            self.getName(),
-            ])
-
-        return hashlib.sha1(contents).hexdigest()
-
-    def cleanUp(self):
-        """See `IBuildFarmJob`."""
-        Store.of(self).remove(self)
 
=== modified file 'lib/lp/buildmaster/model/packagebuild.py'
--- lib/lp/buildmaster/model/packagebuild.py	2010-05-05 15:48:49 +0000
+++ lib/lp/buildmaster/model/packagebuild.py	2010-05-05 15:48:52 +0000
@@ -13,7 +13,6 @@
 from zope.component import getUtility
 from zope.interface import classProvides, implements
 
-from canonical.database.constants import UTC_NOW
 from canonical.database.enumcol import DBEnum
 from canonical.launchpad.browser.librarian import (
     ProxiedLibraryFileAlias)
@@ -59,19 +58,14 @@
     policy_name = 'buildd'
     distribution = None
 
-    def __init__(self, build):
-        """Construct a PackageBuild.
-
-        XXX 2010-04-21 michael.nelson bug=570939
-        This initialiser is only used by IBuildFarmJobDerived classes
-        that are not yet expecting a concrete BuildFarmJob (and so are
-        expecting to pass in the build to which they refer, such as
-        BinaryPackageBuild/BuildPackageJob, SPRecipeBuild/SPRecipeBuildJob
-        and TranslationTemplatesBuild). Once they have been updated it
-        can be updated for use by new below.
-        """
+    def __init__(self, build_farm_job, archive, pocket,
+                 dependencies=None):
+        """Construct a PackageBuild."""
         super(PackageBuild, self).__init__()
-        self.build = build
+        self.build_farm_job = build_farm_job
+        self.archive = archive
+        self.pocket = pocket
+        self.dependencies = dependencies
 
     @classmethod
     def new(cls, job_type, virtualized, archive, pocket,
@@ -84,67 +78,10 @@
         build_farm_job = getUtility(IBuildFarmJobSource).new(
             job_type, status, processor, virtualized)
 
-        # Update the __init__ and call instead once all callsites use
-        # instances of this class as a concrete class.
-        package_build = cls(None)
-        package_build.build_farm_job = build_farm_job
-        package_build.archive = archive
-        package_build.pocket = pocket
-        package_build.dependencies = dependencies
+        package_build = cls(build_farm_job, archive, pocket, dependencies)
         store.add(package_build)
         return package_build
 
-    def getTitle(self):
-        """See `IBuildFarmJob`.
-
-        XXX 2010-04-21 michael.nelson bug=567922. This method
-        can be removed once all *Build classes use the concrete
-        BuildFarmJob.
-        """
-        if self.has_concrete_build_farm_job:
-            return self.build_farm_job.getTitle()
-
-        return self.build.title
-
-    def jobStarted(self):
-        """See `IBuildFarmJob`.
-
-        XXX 2010-04-21 michael.nelson bug=567922. This method
-        can be removed once all *Build classes use the concrete
-        BuildFarmJob.
-        """
-        if self.has_concrete_build_farm_job:
-            return self.build_farm_job.jobStarted()
-
-        self.build.buildstate = BuildStatus.BUILDING
-        # The build started, set the start time if not set already.
-        if self.build.date_first_dispatched is None:
-            self.build.date_first_dispatched = UTC_NOW
-
-    def jobReset(self):
-        """See `IBuildFarmJob`.
-
-        XXX 2010-04-21 michael.nelson bug=567922. This method
-        can be removed once all *Build classes use the concrete
-        BuildFarmJob.
-        """
-        if self.has_concrete_build_farm_job:
-            return self.build_farm_job.jobReset()
-
-        self.build.buildstate = BuildStatus.NEEDSBUILD
-
-    def jobAborted(self):
-        """See `IBuildFarmJob`.
-
-        XXX 2010-04-21 michael.nelson bug=567922. This method
-        can be removed once all *Build classes use the concrete
-        BuildFarmJob.
-        """
-        if self.has_concrete_build_farm_job:
-            return self.build_farm_job.jobAborted()
-
-        self.build.buildstate = BuildStatus.NEEDSBUILD
-
     @property
     def current_component(self):
         """See `IPackageBuild`."""
 
=== modified file 'lib/lp/buildmaster/tests/test_buildfarmjob.py'
--- lib/lp/buildmaster/tests/test_buildfarmjob.py	2010-05-05 15:48:49 +0000
+++ lib/lp/buildmaster/tests/test_buildfarmjob.py	2010-05-05 15:48:52 +0000
@@ -34,18 +34,6 @@
         return getUtility(IBuildFarmJobSource).new(
             job_type=BuildFarmJobType.PACKAGEBUILD)
 
-    def test_has_concrete_build_farm_job(self):
-        # This temporary property returns true if the instance
-        # corresponds to a concrete database record, even if
-        # db updates have not yet been flushed, and false
-        # otherwise.
-        concrete_build_farm_job = self.makeBuildFarmJob()
-        self.failUnless(concrete_build_farm_job.has_concrete_build_farm_job)
-
-        mem_build_farm_job = BuildFarmJob(
-            job_type=BuildFarmJobType.PACKAGEBUILD)
-        self.failIf(mem_build_farm_job.has_concrete_build_farm_job)
-
     def test_providesInterface(self):
         # BuildFarmJob provides IBuildFarmJob
         self.assertProvides(self.build_farm_job, IBuildFarmJob)
 
=== modified file 'lib/lp/code/model/sourcepackagerecipebuild.py'
--- lib/lp/code/model/sourcepackagerecipebuild.py	2010-05-05 15:48:49 +0000
+++ lib/lp/code/model/sourcepackagerecipebuild.py	2010-05-05 15:48:52 +0000
@@ -27,8 +27,7 @@
 from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
 from lp.buildmaster.model.buildbase import BuildBase
 from lp.buildmaster.model.buildqueue import BuildQueue
-from lp.buildmaster.model.buildfarmjob import BuildFarmJobDerived
-from lp.buildmaster.model.packagebuild import PackageBuild
+from lp.buildmaster.model.buildfarmjob import BuildFarmJobOldDerived
 from lp.code.interfaces.sourcepackagerecipebuild import (
     ISourcePackageRecipeBuildJob, ISourcePackageRecipeBuildJobSource,
     ISourcePackageRecipeBuild, ISourcePackageRecipeBuildSource)
@@ -37,6 +36,7 @@
 from lp.soyuz.adapters.archivedependencies import (
     default_component_dependency_name,)
 from lp.soyuz.interfaces.component import IComponentSet
+from lp.soyuz.model.buildfarmbuildjob import BuildFarmBuildJob
 from lp.soyuz.model.sourcepackagerelease import SourcePackageRelease
 
 
@@ -199,7 +199,7 @@
         return
 
 
-class SourcePackageRecipeBuildJob(BuildFarmJobDerived, Storm):
+class SourcePackageRecipeBuildJob(BuildFarmJobOldDerived, Storm):
     classProvides(ISourcePackageRecipeBuildJobSource)
     implements(ISourcePackageRecipeBuildJob)
 
@@ -226,7 +226,7 @@
         """Setup the IBuildFarmJob delegate.
 
         We override this to provide a delegate specific to package builds."""
-        self.build_farm_job = PackageBuild(self.build)
+        self.build_farm_job = BuildFarmBuildJob(self.build)
 
     @classmethod
     def new(cls, build, job):
 
=== modified file 'lib/lp/soyuz/interfaces/buildfarmbuildjob.py'
--- lib/lp/soyuz/interfaces/buildfarmbuildjob.py	2010-04-09 15:46:09 +0000
+++ lib/lp/soyuz/interfaces/buildfarmbuildjob.py	2010-05-05 15:48:52 +0000
@@ -10,11 +10,11 @@
 
 from canonical.launchpad import _
 from lazr.restful.fields import Reference
-from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
+from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJobOld
 from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuild
 
 
-class IBuildFarmBuildJob(IBuildFarmJob):
+class IBuildFarmBuildJob(IBuildFarmJobOld):
     """An `IBuildFarmJob` with an `IBuild` reference."""
     build = Reference(
         IBinaryPackageBuild, title=_("Build"), required=True, readonly=True,
 
=== modified file 'lib/lp/soyuz/model/buildpackagejob.py'
--- lib/lp/soyuz/model/buildpackagejob.py	2010-05-05 15:48:49 +0000
+++ lib/lp/soyuz/model/buildpackagejob.py	2010-05-05 15:48:52 +0000
@@ -18,17 +18,17 @@
 from canonical.database.sqlbase import sqlvalues
 
 from lp.buildmaster.interfaces.buildbase import BuildStatus
-from lp.buildmaster.model.buildfarmjob import BuildFarmJobDerived
-from lp.buildmaster.model.packagebuild import PackageBuild
+from lp.buildmaster.model.buildfarmjob import BuildFarmJobOldDerived
 from lp.registry.interfaces.sourcepackage import SourcePackageUrgency
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.interfaces.archive import ArchivePurpose
 from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
 from lp.soyuz.interfaces.buildpackagejob import IBuildPackageJob
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
-
-
-class BuildPackageJob(BuildFarmJobDerived, Storm):
+from lp.soyuz.model.buildfarmbuildjob import BuildFarmBuildJob
+
+
+class BuildPackageJob(BuildFarmJobOldDerived, Storm):
     """See `IBuildPackageJob`."""
     implements(IBuildPackageJob)
 
@@ -49,7 +49,7 @@
         """Setup the IBuildFarmJob delegate.
 
         We override this to provide a delegate specific to package builds."""
-        self.build_farm_job = PackageBuild(self.build)
+        self.build_farm_job = BuildFarmBuildJob(self.build)
 
     def score(self):
         """See `IBuildPackageJob`."""
 
=== modified file 'lib/lp/soyuz/tests/test_buildpackagejob.py'
--- lib/lp/soyuz/tests/test_buildpackagejob.py	2010-04-20 14:30:00 +0000
+++ lib/lp/soyuz/tests/test_buildpackagejob.py	2010-05-05 15:48:52 +0000
@@ -13,9 +13,9 @@
 
 from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.builder import IBuilderSet
-from lp.buildmaster.interfaces.buildfarmjob import (
-    IBuildFarmJob, IBuildFarmJobDerived)
+from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJobDerived
 from lp.soyuz.interfaces.archive import ArchivePurpose
+from lp.soyuz.interfaces.buildfarmbuildjob import IBuildFarmBuildJob
 from lp.soyuz.interfaces.buildpackagejob import IBuildPackageJob
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
@@ -234,7 +234,7 @@
         build, bq = find_job(self, 'gcc', '386')
         build_farm_job = bq.specific_job
         self.assertProvides(build_farm_job, IBuildPackageJob)
-        self.assertProvides(build_farm_job, IBuildFarmJob)
+        self.assertProvides(build_farm_job, IBuildFarmBuildJob)
         self.assertProvides(build_farm_job, IBuildFarmJobDerived)
 
 
 
=== modified file 'lib/lp/translations/model/translationtemplatesbuildjob.py'
--- lib/lp/translations/model/translationtemplatesbuildjob.py	2010-05-05 15:48:49 +0000
+++ lib/lp/translations/model/translationtemplatesbuildjob.py	2010-05-05 15:48:52 +0000
@@ -23,7 +23,7 @@
 from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
 from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
 from lp.buildmaster.model.buildfarmjob import (
-    BuildFarmJob, BuildFarmJobDerived)
+    BuildFarmJobOld, BuildFarmJobOldDerived)
 from lp.buildmaster.model.buildqueue import BuildQueue
 from lp.code.interfaces.branchjob import IRosettaUploadJobSource
 from lp.buildmaster.interfaces.buildfarmbranchjob import IBuildFarmBranchJob
@@ -33,7 +33,7 @@
 from lp.translations.pottery.detect_intltool import is_intltool_structure
 
 
-class TranslationTemplatesBuildJob(BuildFarmJobDerived, BranchJobDerived):
+class TranslationTemplatesBuildJob(BuildFarmJobOldDerived, BranchJobDerived):
     """An `IBuildFarmJob` implementation that generates templates.
 
     Implementation-wise, this is actually a `BranchJob`.
@@ -55,8 +55,7 @@
 
         We override this to provide a non-database delegate that simply
         provides required functionality to the queue system."""
-        self.build_farm_job = BuildFarmJob(
-            job_type=BuildFarmJobType.TRANSLATIONTEMPLATESBUILD)
+        self.build_farm_job = BuildFarmJobOld()
 
     def score(self):
         """See `IBuildFarmJob`."""
 
=== modified file 'lib/lp/translations/tests/test_translationtemplatesbuildjob.py'
--- lib/lp/translations/tests/test_translationtemplatesbuildjob.py	2010-04-30 03:10:17 +0000
+++ lib/lp/translations/tests/test_translationtemplatesbuildjob.py	2010-05-05 15:48:52 +0000
@@ -9,7 +9,6 @@
 from zope.event import notify
 from zope.security.proxy import removeSecurityProxy
 
-from sqlobject import SQLObjectNotFound
 from storm.store import Store
 
 from canonical.launchpad.webapp.testing import verifyObject
@@ -20,7 +19,7 @@
 from lp.testing import TestCaseWithFactory
 
 from lp.buildmaster.interfaces.buildfarmjob import (
-    IBuildFarmJob, IBuildFarmJobDerived)
+    IBuildFarmJobOld, IBuildFarmJobDerived)
 from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
 from lp.buildmaster.model.buildqueue import BuildQueue
 from lp.code.interfaces.branch import IBranchSet
@@ -54,11 +53,11 @@
         self.specific_job = self.jobset.create(self.branch)
 
     def test_new_TranslationTemplatesBuildJob(self):
-        # TranslationTemplateBuildJob implements IBuildFarmJob,
+        # TranslationTemplateBuildJob implements IBuildFarmJobOld,
         # IBuildFarmJobDerived, and IBranchJob.
         verifyObject(IBranchJob, self.specific_job)
         verifyObject(IBuildFarmJobDerived, self.specific_job)
-        verifyObject(IBuildFarmJob, self.specific_job)
+        verifyObject(IBuildFarmJobOld, self.specific_job)
 
         # Each of these jobs knows the branch it will operate on.
         self.assertEqual(self.branch, self.specific_job.branch)