Merge lp:~michael.nelson/launchpad/567922-binarypackagebuild-new-table-1 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
========
This branch *finally* starts the work to switch our BinaryPackageBuild class to the new binarypackagebuild table (using the delegated PackageBuild/BuildFarmJob).

Details
=======
It updates the SQLBase _table to BinaryPackageBuild and then deals with the fallout to ensure that the stated interface is still provided.

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:
bin/test -vv -m soyuz.tests.test_build$ -t test_providesInterface

The next branch will continue to update the BinaryPackageBuild implementation to get the rest of the tests working.

[Aaron Bentley (abentley)]

distro_series should be defined on IPackageBuild, because it's common to all packages, even though the implementation will differ for ISourcePackageRecipeBuild and IBinaryBuild. If needed, define a property on IPackageBuild that raises NotImplementedError.

diff lines 342-343 need to be re-indented.

I'm also concerned about the split between IPackageBuild and IPackageBuildDerived. It seems like there should only be one interface for things that are "package builds", so please see if you can unify them, or at least make it clear that IPackageBuild only exists to represent the PackageBuild model object.

[Michael Nelson (michael.nelson)]

On Mon, May 3, 2010 at 5:55 PM, Aaron Bentley <email address hidden> wrote:
> distro_series should be defined on IPackageBuild, because it's common to all packages, even though the implementation will differ for ISourcePackageRecipeBuild and IBinaryBuild.  If needed, define a property on IPackageBuild that raises NotImplementedError.

Thanks - I added it but returned None on PackageBuild (similar to the
other attributes) as raising NotImplementedError for attributes means
that the exception is raised during assertProvides(), or is there a
better way?

>
> diff lines 342-343 need to be re-indented.

Done.

>
> I'm also concerned about the split between IPackageBuild and IPackageBuildDerived.  It seems like there should only be one interface for things that are "package builds", so please see if you can unify them, or at least make it clear that IPackageBuild only exists to represent the PackageBuild model object.

Thanks for taking the extra time to improve the design beyond the
actual review itself! You were spot on... I'd started getting mixed up
while trying to find places to move methods to. I've removed
IPackageBuildDerived (moving handleStatus to IPackageBuild), and
instead created a mixin class PackageBuildHandleStatusMixin which can
be used to provide an implementation on derived classes (ie. this
implementation can be shared between BinaryPackageBuilds and
SPRBuilds, as it is currently with BuildBase).

I've attached the incremental of the above, but if it's ok with you,
I'll also do a second incremental to get rid of IBuildFarmJobDerived
for the same reason you've outlined above.

[Michael Nelson (michael.nelson)]

On Tue, May 4, 2010 at 2:14 PM, Michael Nelson
<email address hidden> wrote:
...
> I've attached the incremental of the above, but if it's ok with you,
> I'll also do a second incremental to get rid of IBuildFarmJobDerived
> for the same reason you've outlined above.
>

See attached for the removal of the IBuildFarmJobDerived interface as
above. I also realised while doing this that I don't need the separate
mixin, and have instead provided the shared implementation on the
BuildFarmJobDerived/PackageJobDerived classes directly.

tested with:
bin/test -vv -t test_buildfarmjob -t test_packagebuild -t
test_sourcepackagerecipebuild -t test_translationtemplatesbuildjob

-Michael

[Aaron Bentley (abentley)]

Looks like a good improvement.

review: Approve

=== modified file 'lib/lp/buildmaster/doc/buildfarmjob.txt'
--- lib/lp/buildmaster/doc/buildfarmjob.txt	2010-05-05 15:51:38 +0000
+++ lib/lp/buildmaster/doc/buildfarmjob.txt	2010-05-05 15:51:40 +0000
@@ -29,17 +29,6 @@
 
 For more details, please refer to lp.buildmaster.tests.test_buildfarmjob.
 
-BuildFarmJobDerived
-===================
-
-BuildFarmJobDerived exists to encapsulate the functionality required
-by classes delegating IBuildFarmJob.
-
-    >>> from lp.buildmaster.interfaces.buildfarmjob import (
-    ...     IBuildFarmJobDerived)
-    >>> verifyObject(IBuildFarmJobDerived, BuildFarmJobDerived())
-    True
-
 This class also includes the getByJob() class method used to find the
 instance of a specific build-farm job implementation associated with a
 given Job instance which must be called in the context of a concrete

=== modified file 'lib/lp/buildmaster/interfaces/buildfarmjob.py'
--- lib/lp/buildmaster/interfaces/buildfarmjob.py	2010-05-05 15:51:38 +0000
+++ lib/lp/buildmaster/interfaces/buildfarmjob.py	2010-05-05 15:51:40 +0000
@@ -11,7 +11,6 @@
     'IBuildFarmJob',
     'IBuildFarmJobOld',
     'IBuildFarmJobSource',
-    'IBuildFarmJobDerived',
     'BuildFarmJobType',
     ]
 
@@ -106,6 +105,71 @@
     def jobAborted():
         """'Job aborted' life cycle event, handle as appropriate."""
 
+    def addCandidateSelectionCriteria(processor, virtualized):
+        """Provide a sub-query to refine the candidate job selection.
+
+        Return a sub-query to narrow down the list of candidate jobs.
+        The sub-query will become part of an "outer query" and is free to
+        refer to the `BuildQueue` and `Job` tables already utilized in the
+        latter.
+
+        Example (please see the `BuildPackageJob` implementation for a
+        complete example):
+
+            SELECT TRUE
+            FROM Archive, Build, BuildPackageJob, DistroArchSeries
+            WHERE
+            BuildPackageJob.job = Job.id AND
+            ..
+
+        :param processor: the type of processor that the candidate jobs are
+            expected to run on.
+        :param virtualized: whether the candidate jobs are expected to run on
+            the `processor` natively or inside a virtual machine.
+        :return: a string containing a sub-query that narrows down the list of
+            candidate jobs.
+        """
+
+    def postprocessCandidate(job, logger):
+        """True if the candidate job is fine and should be dispatched
+        to a builder, False otherwise.
+
+        :param job: The `BuildQueue` instance to be scrutinized.
+        :param logger: The logger to use.
+
+        :return: True if the candidate job should be dispatched
+            to a builder, False otherwise.
+        """
+
+    def getByJob(job):
+        """Get the specific `IBuildFarmJob` for the given `Job`.
+
+        Invoked on the specific `IBuildFarmJob`-implementing class that
+        has an entry associated with `job`.
+        """
+
+    def generateSlaveBuildCookie():
+        """Produce a cookie for the slave as a token of the job it's doing.
+
+        The cookie need not be unique, but should be hard for a
+        compromised slave to guess.
+
+        :return: a hard-to-guess ASCII string that can be reproduced
+            accurately based on this job's properties.
+        """
+
+    def makeJob():
+        """Create the specific job relating this with an lp.services.job.
+
+        XXX 2010-04-26 michael.nelson bug=567922
+        Once all *Build classes are using BuildFarmJob we can lose the
+        'specific_job' attributes and simply have a reference to the
+        services job directly on the BuildFarmJob.
+        """
+
+    def cleanUp():
+        """Job's finished.  Delete its supporting data."""
+
 
 class IBuildFarmJob(IBuildFarmJobOld):
     """Operations that jobs for the build farm must implement."""
@@ -179,78 +243,6 @@
 
     title = exported(TextLine(title=_("Title"), required=False))
 
-    def makeJob():
-        """Create the specific job relating this with an lp.services.job.
-
-        XXX 2010-04-26 michael.nelson bug=567922
-        Once all *Build classes are using BuildFarmJob we can lose the
-        'specific_job' attributes and simply have a reference to the
-        services job directly on the BuildFarmJob.
-        """
-
-
-class IBuildFarmJobDerived(Interface):
-    """Common functionality required by classes delegating IBuildFarmJob.
-
-    An implementation of this class must setup the necessary delegation.
-    """
-
-    def getByJob(job):
-        """Get the specific `IBuildFarmJob` for the given `Job`.
-
-        Invoked on the specific `IBuildFarmJob`-implementing class that
-        has an entry associated with `job`.
-        """
-
-    def addCandidateSelectionCriteria(processor, virtualized):
-        """Provide a sub-query to refine the candidate job selection.
-
-        Return a sub-query to narrow down the list of candidate jobs.
-        The sub-query will become part of an "outer query" and is free to
-        refer to the `BuildQueue` and `Job` tables already utilized in the
-        latter.
-
-        Example (please see the `BuildPackageJob` implementation for a
-        complete example):
-
-            SELECT TRUE
-            FROM Archive, Build, BuildPackageJob, DistroArchSeries
-            WHERE
-            BuildPackageJob.job = Job.id AND
-            ..
-
-        :param processor: the type of processor that the candidate jobs are
-            expected to run on.
-        :param virtualized: whether the candidate jobs are expected to run on
-            the `processor` natively or inside a virtual machine.
-        :return: a string containing a sub-query that narrows down the list of
-            candidate jobs.
-        """
-
-    def postprocessCandidate(job, logger):
-        """True if the candidate job is fine and should be dispatched
-        to a builder, False otherwise.
-
-        :param job: The `BuildQueue` instance to be scrutinized.
-        :param logger: The logger to use.
-
-        :return: True if the candidate job should be dispatched
-            to a builder, False otherwise.
-        """
-
-    def generateSlaveBuildCookie():
-        """Produce a cookie for the slave as a token of the job it's doing.
-
-        The cookie need not be unique, but should be hard for a
-        compromised slave to guess.
-
-        :return: a hard-to-guess ASCII string that can be reproduced
-            accurately based on this job's properties.
-        """
-
-    def cleanUp():
-        """Job's finished.  Delete its supporting data."""
-
 
 class IBuildFarmJobSource(Interface):
     """A utility of BuildFarmJob used to create _things_."""

=== modified file 'lib/lp/buildmaster/interfaces/packagebuild.py'
--- lib/lp/buildmaster/interfaces/packagebuild.py	2010-05-05 15:51:38 +0000
+++ lib/lp/buildmaster/interfaces/packagebuild.py	2010-05-05 15:51:40 +0000
@@ -6,7 +6,6 @@
 __all__ = [
     'IPackageBuild',
     'IPackageBuildSource',
-    'IPackageBuildDerived',
     ]
 
 
@@ -19,6 +18,7 @@
 from canonical.launchpad.interfaces.librarian import ILibraryFileAlias
 from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
 from lp.registry.interfaces.distribution import IDistribution
+from lp.registry.interfaces.distroseries import IDistroSeries
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.interfaces.archive import IArchive
 
@@ -76,6 +76,12 @@
             title=_("Distribution"), required=True,
             description=_("Shortcut for its distribution.")))
 
+    distro_series = exported(
+        Reference(
+            schema=IDistroSeries,
+            title=_("Distribution series"), required=True,
+            description=_("Shortcut for its distribution series.")))
+
     def getUploaderCommand(distro_series, upload_leaf, uploader_logfilename):
         """Get the command to run as the uploader.
 
@@ -138,6 +144,13 @@
             upload log.
         """
 
+    def handleStatus(status, librarian, slave_status):
+        """Handle a finished build status from a slave.
+
+        :param status: Slave build status string with 'BuildStatus.' stripped.
+        :param slave_status: A dict as returned by IBuilder.slaveStatus
+        """
+
 
 class IPackageBuildSource(Interface):
     """A utility of this interface used to create _things_."""
@@ -149,15 +162,3 @@
         :param pocket: An item of `PackagePublishingPocket`.
         :param dependencies: An optional debian-like dependency line.
         """
-
-
-class IPackageBuildDerived(Interface):
-    """Classes deriving from IPackageBuild inherit the default handleStatus.
-    """
-    def handleStatus(status, librarian, slave_status):
-        """Handle a finished build status from a slave.
-
-        :param status: Slave build status string with 'BuildStatus.' stripped.
-        :param slave_status: A dict as returned by IBuilder.slaveStatus
-        """
-

=== modified file 'lib/lp/buildmaster/model/buildfarmjob.py'
--- lib/lp/buildmaster/model/buildfarmjob.py	2010-05-05 15:51:38 +0000
+++ lib/lp/buildmaster/model/buildfarmjob.py	2010-05-05 15:51:40 +0000
@@ -14,7 +14,6 @@
 
 from lazr.delegates import delegates
 
-import hashlib
 import pytz
 
 from storm.locals import Bool, DateTime, Int, Reference, Storm
@@ -32,8 +31,8 @@
 
 from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.buildfarmjob import (
-    BuildFarmJobType, IBuildFarmJob, IBuildFarmJobDerived,
-    IBuildFarmJobOld, IBuildFarmJobSource)
+    BuildFarmJobType, IBuildFarmJob, IBuildFarmJobOld,
+    IBuildFarmJobSource)
 from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
 
 
@@ -63,6 +62,10 @@
         """See `IBuildFarmJobOld`."""
         raise NotImplementedError
 
+    def getByJob(self):
+        """See `IBuildFarmJobOld`."""
+        raise NotImplementedError
+
     def jobStarted(self):
         """See `IBuildFarmJobOld`."""
         pass
@@ -75,8 +78,27 @@
         """See `IBuildFarmJobOld`."""
         pass
 
+    @staticmethod
+    def addCandidateSelectionCriteria(processor, virtualized):
+        """See `IBuildFarmJobOld`."""
+        return ('')
+
+    @staticmethod
+    def postprocessCandidate(job, logger):
+        """See `IBuildFarmJobOld`."""
+        return True
+
+    def cleanUp(self):
+        """See `IBuildFarmJob`."""
+        Store.of(self).remove(self)
+
+    def generateSlaveBuildCookie(self):
+        """See `IBuildFarmJobOld`."""
+        raise NotImplementedError
+
 
 class BuildFarmJobOldDerived:
+    """Setup the delegation and provide some common implementation."""
     delegates(IBuildFarmJobOld, context='build_farm_job')
 
     def __init__(self, *args, **kwargs):
@@ -102,22 +124,12 @@
 
     @classmethod
     def getByJob(cls, job):
-        """See `IBuildFarmJobDerived`."""
+        """See `IBuildFarmJobOld`."""
         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`."""
+        """See `IBuildFarmJobOld`."""
         buildqueue = getUtility(IBuildQueueSet).getByJob(self.job)
 
         if buildqueue.processor is None:
@@ -136,10 +148,6 @@
 
         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."""
@@ -238,8 +246,6 @@
     @property
     def buildqueue_record(self):
         """See `IBuildFarmJob`."""
-        # Need to update the db schema for buildpackagejob before
-        # this can be implemented here.
         return None
 
     @property
@@ -260,8 +266,16 @@
         """
         return None
 
+    def cleanUp(self):
+        """See `IBuildFarmJobOld`.
+
+        XXX 2010-05-04 michael.nelson bug=570939
+        This can be removed once IBuildFarmJobOld is no longer used
+        and services jobs are linked directly to IBuildFarmJob.
+        """
+        pass
+
 
 class BuildFarmJobDerived:
-    """See `IBuildFarmJobDerived`."""
-    implements(IBuildFarmJobDerived)
+    implements(IBuildFarmJob)
     delegates(IBuildFarmJob, context='build_farm_job')

=== modified file 'lib/lp/buildmaster/model/packagebuild.py'
--- lib/lp/buildmaster/model/packagebuild.py	2010-05-05 15:51:38 +0000
+++ lib/lp/buildmaster/model/packagebuild.py	2010-05-05 15:51:40 +0000
@@ -8,6 +8,8 @@
     ]
 
 
+from lazr.delegates import delegates
+
 from storm.locals import Int, Reference, Storm, Unicode
 
 from zope.component import getUtility
@@ -21,7 +23,7 @@
 from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJobSource
 from lp.buildmaster.interfaces.packagebuild import (
-    IPackageBuild, IPackageBuildDerived, IPackageBuildSource)
+    IPackageBuild, IPackageBuildSource)
 from lp.buildmaster.model.buildbase import BuildBase
 from lp.buildmaster.model.buildfarmjob import BuildFarmJobDerived
 from lp.registry.interfaces.pocket import PackagePublishingPocket
@@ -56,7 +58,11 @@
     build_farm_job = Reference(build_farm_job_id, 'BuildFarmJob.id')
 
     policy_name = 'buildd'
+
+    # The following two properties are part of the IPackageBuild
+    # interface, but need to be provided by derived classes.
     distribution = None
+    distro_series = None
 
     def __init__(self, build_farm_job, archive, pocket,
                  dependencies=None):
@@ -148,13 +154,21 @@
         """See `IPackageBuild`."""
         raise NotImplementedError
 
+    def handleStatus(self, status, librarian, slave_status):
+        """See `IPackageBuild`."""
+        raise NotImplementedError
+
 
 class PackageBuildDerived:
-    """See `IPackageBuildDerived`."""
-    implements(IPackageBuildDerived)
+    """Setup the delegation for package build.
+
+    This class also provides some common implementation for handling
+    build status.
+    """
+    delegates(IPackageBuild, context="package_build")
 
     def handleStatus(self, status, librarian, slave_status):
-        """See `IPackageBuildDerived`."""
+        """See `IPackageBuild`."""
         return BuildBase.handleStatus(self, status, librarian, slave_status)
 
     # The following private handlers currently re-use the BuildBase

=== modified file 'lib/lp/buildmaster/tests/test_buildfarmjob.py'
--- lib/lp/buildmaster/tests/test_buildfarmjob.py	2010-05-05 15:51:38 +0000
+++ lib/lp/buildmaster/tests/test_buildfarmjob.py	2010-05-05 15:51:40 +0000
@@ -68,6 +68,7 @@
         self.assertEqual(None, self.build_farm_job.builder)
         self.assertEqual(None, self.build_farm_job.log)
         self.assertEqual(None, self.build_farm_job.log_url)
+        self.assertEqual(None, self.build_farm_job.buildqueue_record)
 
     def test_unimplemented_methods(self):
         # A build farm job leaves the implementation of various
@@ -111,10 +112,6 @@
             self.build_farm_job.job_type.title,
             self.build_farm_job.title)
 
-    def test_buildqueue_record(self):
-        self.failUnless(
-            False, "Update schema and move buildqueue_record implementation")
-
 
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/buildmaster/tests/test_packagebuild.py'
--- lib/lp/buildmaster/tests/test_packagebuild.py	2010-05-05 15:51:38 +0000
+++ lib/lp/buildmaster/tests/test_packagebuild.py	2010-05-05 15:51:40 +0000
@@ -89,6 +89,9 @@
         self.assertRaises(
             NotImplementedError, self.package_build.verifySuccessfulUpload)
         self.assertRaises(NotImplementedError, self.package_build.notify)
+        self.assertRaises(
+            NotImplementedError, self.package_build.handleStatus,
+            None, None, None)
 
     def test_default_values(self):
         # PackageBuild has a number of default values.
@@ -96,6 +99,7 @@
         self.failUnlessEqual(
             'multiverse', self.package_build.current_component.name)
         self.failUnlessEqual(None, self.package_build.distribution)
+        self.failUnlessEqual(None, self.package_build.distro_series)
 
     def test_log_url(self):
         # The url of the build log file is determined by the PackageBuild.

=== modified file 'lib/lp/code/configure.zcml'
--- lib/lp/code/configure.zcml	2010-04-29 13:24:30 +0000
+++ lib/lp/code/configure.zcml	2010-05-05 15:51:40 +0000
@@ -1024,7 +1024,6 @@
   <class
      class="lp.code.model.sourcepackagerecipebuild.SourcePackageRecipeBuildJob">
     <allow interface="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildJob"/>
-    <allow interface="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJobDerived"/>
   </class>
 
   <securedutility

=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml	2010-04-20 14:30:00 +0000
+++ lib/lp/soyuz/configure.zcml	2010-05-05 15:51:40 +0000
@@ -848,8 +848,6 @@
         class="lp.soyuz.model.buildpackagejob.BuildPackageJob">
         <allow
             interface="lp.soyuz.interfaces.buildpackagejob.IBuildPackageJob"/>
-        <allow
-            interface="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJobDerived"/>
     </class>
     <!--
         The registration below is used to discover all build farm job classes

=== modified file 'lib/lp/soyuz/doc/build.txt'
--- lib/lp/soyuz/doc/build.txt	2010-04-14 17:34:35 +0000
+++ lib/lp/soyuz/doc/build.txt	2010-05-05 15:51:40 +0000
@@ -72,7 +72,7 @@
     >>> firefox_build.was_built
     True
 
-    >>> firefox_build.calculated_buildstart
+    >>> firefox_build.date_started
     datetime.datetime(...)
 
     >>> firefox_build.datebuilt
@@ -895,6 +895,7 @@
 
 Build records inserted by gina don't provide calculated_buildstart
 value, since they miss fields used in its calculation.
+TODO: check and update this based on the new model.
 
     >>> gina_build = getUtility(IBinaryPackageBuildSet).getByBuildID(10)
     >>> gina_build.title
@@ -908,7 +909,7 @@
 this method is protected by an assertion on valid buildduration and
 datebuilt, it makes the diagnosis of problems in current DB easier.
 
-    >>> gina_build.calculated_buildstart
+    >>> gina_build.date_started
     Traceback (most recent call last):
     ...
     AssertionError: value is not suitable for this build record (10)

=== modified file 'lib/lp/soyuz/interfaces/binarypackagebuild.py'
--- lib/lp/soyuz/interfaces/binarypackagebuild.py	2010-04-12 13:17:34 +0000
+++ lib/lp/soyuz/interfaces/binarypackagebuild.py	2010-05-05 15:51:40 +0000
@@ -16,11 +16,12 @@
     ]
 
 from zope.interface import Interface, Attribute
-from zope.schema import Bool, Int, Object, Text
+from zope.schema import Bool, Int, Text
 from lazr.enum import EnumeratedType, Item
 
 from canonical.launchpad import _
-from lp.buildmaster.interfaces.buildbase import IBuildBase
+from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.interfaces.packagebuild import IPackageBuild
 from lp.soyuz.interfaces.processor import IProcessor
 from lp.soyuz.interfaces.publishing import (
     ISourcePackagePublishingHistory)
@@ -38,21 +39,26 @@
     _message_prefix = "Cannot rescore build"
 
 
-class IBinaryPackageBuildView(IBuildBase):
+class IBinaryPackageBuildView(IPackageBuild):
     """A Build interface for items requiring launchpad.View."""
     id = Int(title=_('ID'), required=True, readonly=True)
 
-    processor = Object(
+    package_build = Reference(
+        title=_('Package build'), schema=IPackageBuild, required=True,
+        readonly=True, description=_('The base package build'))
+
+    # Overridden from IBuildFarmJob to ensure required is True.
+    processor = Reference(
         title=_("Processor"), schema=IProcessor,
         required=True, readonly=True,
         description=_("The Processor where this build should be built."))
 
-    sourcepackagerelease = Object(
+    source_package_release = Reference(
         title=_('Source'), schema=ISourcePackageRelease,
         required=True, readonly=True,
         description=_("The SourcePackageRelease requested to build."))
 
-    distroarchseries = Object(
+    distro_arch_series = Reference(
         title=_("Architecture"),
         # Really IDistroArchSeries
         schema=Interface,
@@ -67,7 +73,7 @@
             required=False, readonly=True,
             description=_("The current source publication for this build.")))
 
-    distroseries = Attribute("Direct parent needed by CanonicalURL")
+    distro_series = Attribute("Direct parent needed by CanonicalURL")
     was_built = Attribute("Whether or not modified by the builddfarm.")
     arch_tag = exported(
         Text(title=_("Architecture tag"), required=False))
@@ -93,10 +99,6 @@
             description=_(
                 "Whether or not this build record can be retried.")))
 
-    calculated_buildstart = Attribute(
-        "Emulates a buildstart timestamp by calculating it from "
-        "datebuilt - buildduration.")
-
     is_virtualized = Attribute(
         "Whether or not this build requires a virtual build host or not.")
 
@@ -213,6 +215,21 @@
 class IBinaryPackageBuildSet(Interface):
     """Interface for BinaryPackageBuildSet"""
 
+    def new(distro_arch_series, source_package_release, processor,
+            archive, pocket, status=BuildStatus.NEEDSBUILD,
+            date_created=None):
+        """Create a new `IBinaryPackageBuild`.
+
+        :param distro_arch_series: An `IDistroArchSeries`.
+        :param source_package_release: An `ISourcePackageRelease`.
+        :param processor: An `IProcessor`.
+        :param archive: An `IArchive` in which context the build is built.
+        :param pocket: An item of `PackagePublishingPocket`.
+        :param status: A `BuildStatus` item indicating the builds status.
+        :param date_created: An optional datetime to ensure multiple builds
+            in the same transaction don't all get the same UTC_NOW.
+        """
+
     def getBuildBySRAndArchtag(sourcepackagereleaseID, archtag):
         """Return a build for a SourcePackageRelease and an ArchTag"""
 

=== modified file 'lib/lp/soyuz/model/binarypackagebuild.py'
--- lib/lp/soyuz/model/binarypackagebuild.py	2010-04-15 13:48:46 +0000
+++ lib/lp/soyuz/model/binarypackagebuild.py	2010-05-05 15:51:40 +0000
@@ -11,6 +11,10 @@
 import logging
 import operator
 
+from lazr.delegates import delegates
+
+from storm.locals import Int, Reference
+
 from zope.interface import implements
 from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
@@ -18,13 +22,10 @@
     Desc, In, Join, LeftJoin)
 from storm.store import Store
 from sqlobject import (
-    StringCol, ForeignKey, IntervalCol, SQLObjectNotFound)
+    ForeignKey, SQLObjectNotFound)
 from sqlobject.sqlbuilder import AND, IN
 
 from canonical.config import config
-from canonical.database.constants import UTC_NOW
-from canonical.database.datetimecol import UtcDateTimeCol
-from canonical.database.enumcol import EnumCol
 from canonical.database.sqlbase import quote_like, SQLBase, sqlvalues
 from canonical.launchpad.components.decoratedresultset import (
     DecoratedResultSet)
@@ -43,16 +44,16 @@
 from lp.archivepublisher.utils import get_ppa_reference
 from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
-from lp.buildmaster.model.buildbase import BuildBase
+from lp.buildmaster.interfaces.packagebuild import (
+    IPackageBuild, IPackageBuildSource)
 from lp.buildmaster.model.buildqueue import BuildQueue
-from lp.registry.interfaces.pocket import PackagePublishingPocket
+from lp.buildmaster.model.packagebuild import PackageBuildDerived
 from lp.services.job.model.job import Job
 from lp.soyuz.adapters.archivedependencies import get_components_for_building
 from lp.soyuz.interfaces.archive import ArchivePurpose
 from lp.soyuz.interfaces.binarypackagebuild import (
     BuildSetStatus, CannotBeRescored, IBinaryPackageBuild,
     IBinaryPackageBuildSet)
-from lp.buildmaster.interfaces.buildbase import IBuildBase
 from lp.soyuz.interfaces.publishing import active_publishing_status
 from lp.soyuz.model.binarypackagerelease import BinaryPackageRelease
 from lp.buildmaster.model.builder import Builder
@@ -63,37 +64,21 @@
     PackageUpload, PackageUploadBuild)
 
 
-class BinaryPackageBuild(BuildBase, SQLBase):
-    implements(IBuildBase, IBinaryPackageBuild)
-    _table = 'Build'
+class BinaryPackageBuild(PackageBuildDerived, SQLBase):
+    implements(IBinaryPackageBuild)
+    delegates(IPackageBuild, context="package_build")
+    _table = 'BinaryPackageBuild'
     _defaultOrder = 'id'
 
     build_farm_job_type = BuildFarmJobType.PACKAGEBUILD
 
-    datecreated = UtcDateTimeCol(dbName='datecreated', default=UTC_NOW)
-    processor = ForeignKey(dbName='processor', foreignKey='Processor',
-        notNull=True)
-    distroarchseries = ForeignKey(dbName='distroarchseries',
+    package_build_id = Int(name='package_build', allow_none=False)
+    package_build = Reference(package_build_id, 'PackageBuild.id')
+
+    distro_arch_series = ForeignKey(dbName='distro_arch_series',
         foreignKey='DistroArchSeries', notNull=True)
-    buildstate = EnumCol(dbName='buildstate', notNull=True,
-                         schema=BuildStatus)
-    sourcepackagerelease = ForeignKey(dbName='sourcepackagerelease',
+    source_package_release = ForeignKey(dbName='source_package_release',
         foreignKey='SourcePackageRelease', notNull=True)
-    datebuilt = UtcDateTimeCol(dbName='datebuilt', default=None)
-    buildduration = IntervalCol(dbName='buildduration', default=None)
-    buildlog = ForeignKey(dbName='buildlog', foreignKey='LibraryFileAlias',
-        default=None)
-    builder = ForeignKey(dbName='builder', foreignKey='Builder',
-        default=None)
-    pocket = EnumCol(dbName='pocket', schema=PackagePublishingPocket,
-                     notNull=True)
-    dependencies = StringCol(dbName='dependencies', default=None)
-    archive = ForeignKey(foreignKey='Archive', dbName='archive', notNull=True)
-
-    date_first_dispatched = UtcDateTimeCol(dbName='date_first_dispatched')
-
-    upload_log = ForeignKey(
-        dbName='upload_log', foreignKey='LibraryFileAlias', default=None)
 
     @property
     def buildqueue_record(self):
@@ -110,9 +95,9 @@
         results = store.find(
             SourcePackagePublishingHistory,
             SourcePackagePublishingHistory.archive == self.archive,
-            SourcePackagePublishingHistory.distroseries == self.distroseries,
+            SourcePackagePublishingHistory.distroseries == self.distro_series,
             SourcePackagePublishingHistory.sourcepackagerelease ==
-                self.sourcepackagerelease)
+                self.source_package_release)
         return results.order_by(
             Desc(SourcePackagePublishingHistory.id)).first()
 
@@ -130,7 +115,7 @@
         #assert latest_publication is not None, (
         #    'Build %d lacks a corresponding source publication.' % self.id)
         if latest_publication is None:
-            return self.sourcepackagerelease.component
+            return self.source_package_release.component
 
         return latest_publication.component
 
@@ -173,7 +158,7 @@
             (PackageUpload, LibraryFileAlias, LibraryFileContent),
             PackageUploadBuild.build == self,
             PackageUpload.archive == self.archive,
-            PackageUpload.distroseries == self.distroseries)
+            PackageUpload.distroseries == self.distro_series)
 
         # Return the unique `PackageUpload` record that corresponds to the
         # upload of the result of this `Build`, load the `LibraryFileAlias`
@@ -182,14 +167,14 @@
         return DecoratedResultSet(results, operator.itemgetter(0)).one()
 
     @property
-    def distroseries(self):
+    def distro_series(self):
         """See `IBuild`"""
-        return self.distroarchseries.distroseries
+        return self.distro_arch_series.distroseries
 
     @property
     def distribution(self):
         """See `IBuild`"""
-        return self.distroarchseries.distroseries.distribution
+        return self.distro_series.distribution
 
     @property
     def is_virtualized(self):
@@ -205,22 +190,22 @@
     def title(self):
         """See `IBuild`"""
         return '%s build of %s %s in %s %s %s' % (
-            self.distroarchseries.architecturetag,
-            self.sourcepackagerelease.name,
-            self.sourcepackagerelease.version,
-            self.distribution.name, self.distroseries.name, self.pocket.name)
+            self.distro_arch_series.architecturetag,
+            self.source_package_release.name,
+            self.source_package_release.version,
+            self.distribution.name, self.distro_series.name, self.pocket.name)
 
     @property
     def was_built(self):
         """See `IBuild`"""
-        return self.buildstate not in [BuildStatus.NEEDSBUILD,
-                                       BuildStatus.BUILDING,
-                                       BuildStatus.SUPERSEDED]
+        return self.status not in [BuildStatus.NEEDSBUILD,
+                                   BuildStatus.BUILDING,
+                                   BuildStatus.SUPERSEDED]
 
     @property
     def arch_tag(self):
         """See `IBuild`."""
-        return self.distroarchseries.architecturetag
+        return self.distro_arch_series.architecturetag
 
     @property
     def distributionsourcepackagerelease(self):
@@ -230,8 +215,8 @@
             DistributionSourcePackageRelease)
 
         return DistributionSourcePackageRelease(
-            distribution=self.distroarchseries.distroseries.distribution,
-            sourcepackagerelease=self.sourcepackagerelease)
+            distribution=self.distribution,
+            sourcepackagerelease=self.source_package_release)
 
     @property
     def binarypackages(self):
@@ -251,7 +236,7 @@
         from canonical.launchpad.database import (
             DistroArchSeriesBinaryPackageRelease)
         return [DistroArchSeriesBinaryPackageRelease(
-            self.distroarchseries, bp)
+            self.distro_arch_series, bp)
             for bp in self.binarypackages]
 
     @property
@@ -260,12 +245,12 @@
         # First check that the slave scanner would pick up the build record
         # if we reset it.  PPA and Partner builds are always ok.
         if (self.archive.purpose == ArchivePurpose.PRIMARY and
-            not self.distroseries.canUploadToPocket(self.pocket)):
+            not self.distro_series.canUploadToPocket(self.pocket)):
             # The slave scanner would not pick this up, so it cannot be
             # re-tried.
             return False
 
-        failed_buildstates = [
+        failed_statuses = [
             BuildStatus.FAILEDTOBUILD,
             BuildStatus.MANUALDEPWAIT,
             BuildStatus.CHROOTWAIT,
@@ -274,20 +259,12 @@
 
         # If the build is currently in any of the failed states,
         # it may be retried.
-        return self.buildstate in failed_buildstates
+        return self.status in failed_statuses
 
     @property
     def can_be_rescored(self):
         """See `IBuild`."""
-        return self.buildstate is BuildStatus.NEEDSBUILD
-
-    @property
-    def calculated_buildstart(self):
-        """See `IBuild`."""
-        assert self.datebuilt and self.buildduration, (
-            "value is not suitable for this build record (%d)"
-            % self.id)
-        return self.datebuilt - self.buildduration
+        return self.status is BuildStatus.NEEDSBUILD
 
     def retry(self):
         """See `IBuild`."""
@@ -695,6 +672,23 @@
 class BinaryPackageBuildSet:
     implements(IBinaryPackageBuildSet)
 
+    def new(self, distro_arch_series, source_package_release, processor,
+            archive, pocket, status=BuildStatus.NEEDSBUILD,
+            date_created=None):
+        """See `IBinaryPackageBuildSet`."""
+        # Create the PackageBuild to which the new BinaryPackageBuild
+        # will delegate.
+        package_build = getUtility(IPackageBuildSource).new(
+            BinaryPackageBuild.build_farm_job_type,
+            archive.require_virtualized, archive, pocket, processor,
+            status) #, date_created)
+
+        binary_package_build = BinaryPackageBuild(
+            package_build=package_build,
+            distro_arch_series=distro_arch_series,
+            source_package_release=source_package_release)
+        return binary_package_build
+
     def getBuildBySRAndArchtag(self, sourcepackagereleaseID, archtag):
         """See `IBinaryPackageBuildSet`"""
         clauseTables = ['DistroArchSeries']

=== modified file 'lib/lp/soyuz/model/sourcepackagerelease.py'
--- lib/lp/soyuz/model/sourcepackagerelease.py	2010-04-12 08:29:02 +0000
+++ lib/lp/soyuz/model/sourcepackagerelease.py	2010-05-05 15:51:40 +0000
@@ -41,6 +41,7 @@
 from lp.registry.interfaces.sourcepackage import (
     SourcePackageType, SourcePackageUrgency)
 from lp.soyuz.interfaces.archive import IArchiveSet, MAIN_ARCHIVE_PURPOSES
+from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
 from lp.soyuz.interfaces.packagediff import (
     PackageDiffAlreadyRequested, PackageDiffStatus)
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
@@ -310,12 +311,12 @@
         else:
             return 0.0
 
-    def createBuild(self, distroarchseries, pocket, archive, processor=None,
+    def createBuild(self, distro_arch_series, pocket, archive, processor=None,
                     status=None):
         """See ISourcePackageRelease."""
         # Guess a processor if one is not provided
         if processor is None:
-            pf = distroarchseries.processorfamily
+            pf = distro_arch_series.processorfamily
             # We guess at the first processor in the family
             processor = shortlist(pf.processors)[0]
 
@@ -325,15 +326,16 @@
         # Force the current timestamp instead of the default
         # UTC_NOW for the transaction, avoid several row with
         # same datecreated.
-        datecreated = datetime.datetime.now(pytz.timezone('UTC'))
+        date_created = datetime.datetime.now(pytz.timezone('UTC'))
 
-        return BinaryPackageBuild(distroarchseries=distroarchseries,
-                     sourcepackagerelease=self,
-                     processor=processor,
-                     buildstate=status,
-                     datecreated=datecreated,
-                     pocket=pocket,
-                     archive=archive)
+        return getUtility(IBinaryPackageBuildSet).new(
+            distro_arch_series=distro_arch_series,
+            source_package_release=self,
+            processor=processor,
+            status=status,
+            date_created=date_created,
+            pocket=pocket,
+            archive=archive)
 
     def getBuildByArch(self, distroarchseries, archive):
         """See ISourcePackageRelease."""

=== modified file 'lib/lp/soyuz/templates/build-index.pt'
--- lib/lp/soyuz/templates/build-index.pt	2010-02-24 13:39:16 +0000
+++ lib/lp/soyuz/templates/build-index.pt	2010-05-05 15:51:40 +0000
@@ -169,7 +169,7 @@
       <tal:built condition="context/was_built">
         <li tal:condition="context/buildduration">
           Started <span
-           tal:define="start context/calculated_buildstart"
+           tal:define="start context/date_started"
            tal:attributes="title start/fmt:datetime"
            tal:content="start/fmt:displaydate">2008-01-01</span>
         </li>

=== modified file 'lib/lp/soyuz/templates/builds-list.pt'
--- lib/lp/soyuz/templates/builds-list.pt	2009-11-12 15:12:12 +0000
+++ lib/lp/soyuz/templates/builds-list.pt	2010-05-05 15:51:40 +0000
@@ -59,9 +59,9 @@
               <tal:soyuz_record condition="build/buildduration">
                  <span
                    tal:attributes="
-                     title build/calculated_buildstart/fmt:datetime"
+                     title build/date_started/fmt:datetime"
                    tal:content="
-                   build/calculated_buildstart/fmt:displaydate" />
+                   build/date_started/fmt:displaydate" />
               </tal:soyuz_record>
               <tal:gina_record condition="not: build/buildduration">
                   <i>at an unknown time</i>

=== modified file 'lib/lp/soyuz/tests/test_build.py'
--- lib/lp/soyuz/tests/test_build.py	2010-05-05 15:51:38 +0000
+++ lib/lp/soyuz/tests/test_build.py	2010-05-05 15:51:40 +0000
@@ -3,8 +3,6 @@
 
 """Test Build features."""
 
-from datetime import datetime, timedelta
-import pytz
 import unittest
 
 from storm.store import Store
@@ -13,9 +11,10 @@
 from canonical.database.constants import UTC_NOW
 from canonical.testing import LaunchpadZopelessLayer
 from lp.services.job.model.job import Job
-from lp.buildmaster.interfaces.buildbase import BuildStatus, IBuildBase
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.builder import IBuilderSet
 from lp.buildmaster.interfaces.buildqueue import IBuildQueue
+from lp.buildmaster.interfaces.packagebuild import IPackageBuild
 from lp.buildmaster.model.buildqueue import BuildQueue
 from lp.soyuz.interfaces.binarypackagebuild import (
     IBinaryPackageBuild, IBinaryPackageBuildSet)
@@ -41,19 +40,13 @@
             spr_only=True, sourcename="gedit",
             status=PackagePublishingStatus.PUBLISHED)
         self.build = gedit_spr.createBuild(
-            distroarchseries=publisher.distroseries['i386'],
+            distro_arch_series=publisher.distroseries['i386'],
             archive=gedit_spr.upload_archive,
             pocket=gedit_spr.package_upload.pocket)
 
     def test_providesInterfaces(self):
-        # Build provides IBuildBase and IBuild.
-
-        # The IBinaryPackageBuild.calculated_buildstart property asserts
-        # that both datebuilt and buildduration are set.
-        self.build.datebuilt = datetime.now(pytz.UTC)
-        self.build.buildduration = timedelta(0, 1)
-
-        self.assertProvides(self.build, IBuildBase)
+        # Build provides IPackageBuild and IBuild.
+        self.assertProvides(self.build, IPackageBuild)
         self.assertProvides(self.build, IBinaryPackageBuild)
 
     def test_queueBuild(self):
@@ -290,7 +283,8 @@
 
     def testDependencies(self):
         """Verify that storeBuildInfo sets any dependencies."""
-        self.build.storeBuildInfo(self.build, None, {'dependencies': 'somepackage'})
+        self.build.storeBuildInfo(
+            self.build, None, {'dependencies': 'somepackage'})
         self.assertIsNot(None, self.build.buildlog)
         self.assertEqual(self.builder, self.build.builder)
         self.assertEqual(u'somepackage', self.build.dependencies)

=== modified file 'lib/lp/soyuz/tests/test_buildpackagejob.py'
--- lib/lp/soyuz/tests/test_buildpackagejob.py	2010-05-05 15:51:38 +0000
+++ lib/lp/soyuz/tests/test_buildpackagejob.py	2010-05-05 15:51:40 +0000
@@ -13,7 +13,6 @@
 
 from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.builder import IBuilderSet
-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
@@ -235,6 +234,3 @@
         build_farm_job = bq.specific_job
         self.assertProvides(build_farm_job, IBuildPackageJob)
         self.assertProvides(build_farm_job, IBuildFarmBuildJob)
-        self.assertProvides(build_farm_job, IBuildFarmJobDerived)
-
-

=== modified file 'lib/lp/translations/configure.zcml'
--- lib/lp/translations/configure.zcml	2010-04-22 07:33:12 +0000
+++ lib/lp/translations/configure.zcml	2010-05-05 15:51:40 +0000
@@ -578,9 +578,7 @@
         <allow
             interface="lp.code.interfaces.branchjob.IBranchJob"/>
         <allow
-            interface="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJob"/>
-        <allow
-            interface="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJobDerived"/>
+            interface="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJobOld"/>
     </class>
     <securedutility
         component="lp.translations.model.translationtemplatesbuildjob.TranslationTemplatesBuildJob"

=== modified file 'lib/lp/translations/model/translationtemplatesbuildjob.py'
--- lib/lp/translations/model/translationtemplatesbuildjob.py	2010-05-05 15:51:38 +0000
+++ lib/lp/translations/model/translationtemplatesbuildjob.py	2010-05-05 15:51:40 +0000
@@ -147,7 +147,7 @@
 
     @classmethod
     def getByJob(cls, job):
-        """See `IBuildFarmJobDerived`.
+        """See `IBuildFarmJob`.
 
         Overridden here to search via a BranchJob, rather than a Job.
         """

=== modified file 'lib/lp/translations/tests/test_translationtemplatesbuildjob.py'
--- lib/lp/translations/tests/test_translationtemplatesbuildjob.py	2010-05-05 15:51:38 +0000
+++ lib/lp/translations/tests/test_translationtemplatesbuildjob.py	2010-05-05 15:51:40 +0000
@@ -19,7 +19,7 @@
 from lp.testing import TestCaseWithFactory
 
 from lp.buildmaster.interfaces.buildfarmjob import (
-    IBuildFarmJobOld, IBuildFarmJobDerived)
+    IBuildFarmJobOld)
 from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
 from lp.buildmaster.model.buildqueue import BuildQueue
 from lp.code.interfaces.branch import IBranchSet
@@ -54,9 +54,8 @@
 
     def test_new_TranslationTemplatesBuildJob(self):
         # TranslationTemplateBuildJob implements IBuildFarmJobOld,
-        # IBuildFarmJobDerived, and IBranchJob.
+        # and IBranchJob.
         verifyObject(IBranchJob, self.specific_job)
-        verifyObject(IBuildFarmJobDerived, self.specific_job)
         verifyObject(IBuildFarmJobOld, self.specific_job)
 
         # Each of these jobs knows the branch it will operate on.