Merge lp:~michael.nelson/launchpad/567922-binarypackagebuild-new-table-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

**Note**: If it's possible, please ignore the conflicts with db-devel - it's due to a reversion of some work that was in db-devel and that I'd already pumped through the pipeline, and I'm waiting for that work to land again on db-devel before re-merging and pumping.

The actual diff of this branch from the previous is:
http://pastebin.ubuntu.com/432164/

Overview
========
This branch continues the work to switch our BinaryPackageBuild class to the new binarypackagebuild table (using the delegated PackageBuild/BuildFarmJob).

It (finally) gets all the soyuz unit tests passing.

Details
=======
This branch just gets the remaining soyuz unit tests passing and starts on the soyuz doctests.

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 -t test_packageupload -t doc/archive-files.txt -t doc/archive.txt -t doc/binarypackagerelease.txt -t build-failedtoupload-workflow.txt

The next branch will continue getting the soyuz doctests passing with the new model.

[Edwin Grubbs (edwin-grubbs)]

Looks good.

review: Approve (code)

=== modified file 'lib/lp/archiveuploader/nascentupload.py'
--- lib/lp/archiveuploader/nascentupload.py	2010-02-26 16:52:46 +0000
+++ lib/lp/archiveuploader/nascentupload.py	2010-05-12 11:01:39 +0000
@@ -780,7 +780,7 @@
                     # fine.
                     ancestry = self.getBinaryAncestry(
                         uploaded_file, try_other_archs=False)
-                    if (ancestry is not None and 
+                    if (ancestry is not None and
                         not self.policy.archive.is_copy):
                         # Ignore version checks for copy archives
                         # because the ancestry comes from the primary
@@ -962,7 +962,7 @@
                                    for build in self.queue_root.builds]
                 if considered_build.id in attached_builds:
                     continue
-                assert (considered_build.sourcepackagerelease.id ==
+                assert (considered_build.source_package_release.id ==
                         sourcepackagerelease.id), (
                     "Upload contains binaries of different sources.")
                 self.queue_root.addBuild(considered_build)
 
=== modified file 'lib/lp/archiveuploader/nascentuploadfile.py'
--- lib/lp/archiveuploader/nascentuploadfile.py	2010-04-09 15:46:09 +0000
+++ lib/lp/archiveuploader/nascentuploadfile.py	2010-05-12 11:01:39 +0000
@@ -806,7 +806,7 @@
             build = sourcepackagerelease.getBuildByArch(
                 dar, self.policy.archive)
             if build is not None:
-                build.buildstate = BuildStatus.FULLYBUILT
+                build.status = BuildStatus.FULLYBUILT
                 self.logger.debug("Updating build for %s: %s" % (
                     dar.architecturetag, build.id))
             else:
@@ -822,7 +822,7 @@
             # Ensure gathered binary is related to a FULLYBUILT build
             # record. It will be check in slave-scanner procedure to
             # certify that the build was processed correctly.
-            build.buildstate = BuildStatus.FULLYBUILT
+            build.status = BuildStatus.FULLYBUILT
             # Also purge any previous failed upload_log stored, so its
             # content can be garbage-collected since it's not useful
             # anymore.
@@ -831,9 +831,9 @@
         # Sanity check; raise an error if the build we've been
         # told to link to makes no sense (ie. is not for the right
         # source package).
-        if (build.sourcepackagerelease != sourcepackagerelease or
+        if (build.source_package_release != sourcepackagerelease or
             build.pocket != self.policy.pocket or
-            build.distroarchseries != dar or
+            build.distro_arch_series != dar or
             build.archive != self.policy.archive):
             raise UploadError(
                 "Attempt to upload binaries specifying "
 
=== modified file 'lib/lp/buildmaster/browser/configure.zcml'
--- lib/lp/buildmaster/browser/configure.zcml	2010-05-12 11:01:28 +0000
+++ lib/lp/buildmaster/browser/configure.zcml	2010-05-12 11:01:39 +0000
@@ -10,5 +10,6 @@
     i18n_domain="launchpad">
     <browser:url
         for="lp.buildmaster.interfaces.packagebuild.IPackageBuild"
-        urldata="lp.buildmaster.browser.packagebuild.PackageBuildUrl"/>
+        path_expression="string:+build/${build_farm_job/id}"
+        attribute_to_parent="archive"/>
 </configure>
 
=== removed file 'lib/lp/buildmaster/browser/packagebuild.py'
--- lib/lp/buildmaster/browser/packagebuild.py	2010-05-12 11:01:28 +0000
+++ lib/lp/buildmaster/browser/packagebuild.py	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""URLs for PackageBuild classes."""
-
-from zope.interface import implements
-
-from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
-
-
-class PackageBuildUrl:
-    """Dynamic URL declaration for IPackageBuild classes.
-
-    When dealing with distribution builds we want to present them
-    under IDistributionSourcePackageRelease url:
-
-       /ubuntu/+source/foo/1.0/+build/1234
-
-    On the other hand, PPA builds will be presented under the PPA page:
-
-       /~cprov/+archive/+build/1235
-
-    Copy archives will be presented under the archives page:
-       /ubuntu/+archive/my-special-archive/+build/1234
-    """
-    implements(ICanonicalUrlData)
-    rootsite = None
-
-    def __init__(self, context):
-        self.context = context
-
-    @property
-    def inside(self):
-        if self.context.archive.is_ppa or self.context.archive.is_copy:
-            return self.context.archive
-        else:
-            return self.context.distributionsourcepackagerelease
-
-    @property
-    def path(self):
-        return u"+build/%d" % self.context.build_farm_job.id
-
 
=== modified file 'lib/lp/buildmaster/interfaces/buildfarmjob.py'
--- lib/lp/buildmaster/interfaces/buildfarmjob.py	2010-05-12 11:01:28 +0000
+++ lib/lp/buildmaster/interfaces/buildfarmjob.py	2010-05-12 11:01:39 +0000
@@ -15,7 +15,7 @@
     ]
 
 from zope.interface import Interface, Attribute
-from zope.schema import Bool, Choice, Datetime, TextLine
+from zope.schema import Bool, Choice, Datetime, TextLine, Timedelta
 from lazr.enum import DBEnumeratedType, DBItem
 from lazr.restful.declarations import exported
 from lazr.restful.fields import Reference
@@ -194,6 +194,11 @@
                 "The timestamp when the build farm job was finished.")),
         ("1.0", dict(exported=True, exported_as="datebuilt")))
 
+    duration = Timedelta(
+        title=_("Duration"), required=False,
+        description=_("Duration interval, calculated when the "
+                      "result gets collected."))
+
     date_first_dispatched = exported(
         Datetime(
             title=_("Date finished"), required=False, readonly=True,
 
=== modified file 'lib/lp/buildmaster/model/buildfarmjob.py'
--- lib/lp/buildmaster/model/buildfarmjob.py	2010-05-12 11:01:28 +0000
+++ lib/lp/buildmaster/model/buildfarmjob.py	2010-05-12 11:01:39 +0000
@@ -220,6 +220,13 @@
         """See `IBuildFarmJob`."""
         return self.job_type.title
 
+    @property
+    def duration(self):
+        """See `IBuildFarmJob`."""
+        if self.date_started is None or self.date_finished is None:
+            return None
+        return self.date_finished - self.date_started
+
     def makeJob(self):
         """See `IBuildFarmJob`."""
         raise NotImplementedError
 
=== modified file 'lib/lp/buildmaster/tests/test_buildfarmjob.py'
--- lib/lp/buildmaster/tests/test_buildfarmjob.py	2010-05-12 11:01:28 +0000
+++ lib/lp/buildmaster/tests/test_buildfarmjob.py	2010-05-12 11:01:39 +0000
@@ -5,10 +5,13 @@
 
 __metaclass__ = type
 
+from datetime import datetime, timedelta
+import pytz
 import unittest
 
 from storm.store import Store
 from zope.component import getUtility
+from zope.security.proxy import removeSecurityProxy
 
 from canonical.database.sqlbase import flush_database_updates
 from canonical.testing.layers import DatabaseFunctionalLayer
@@ -112,6 +115,27 @@
             self.build_farm_job.job_type.title,
             self.build_farm_job.title)
 
+    def test_duration_none(self):
+        # If either start or finished is none, the duration will be
+        # none.
+        self.build_farm_job.jobStarted()
+        self.failUnlessEqual(None, self.build_farm_job.duration)
+
+        self.build_farm_job.jobAborted()
+        removeSecurityProxy(self.build_farm_job).date_finished = (
+            datetime.now(pytz.UTC))
+        self.failUnlessEqual(None, self.build_farm_job.duration)
+
+    def test_duration_set(self):
+        # If both start and finished are defined, the duration will be
+        # returned.
+        now = datetime.now(pytz.UTC)
+        duration = timedelta(1)
+        naked_bfj = removeSecurityProxy(self.build_farm_job)
+        naked_bfj.date_started = now
+        naked_bfj.date_finished = now + duration
+        self.failUnlessEqual(duration, self.build_farm_job.duration)
+
 
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
=== modified file 'lib/lp/soyuz/adapters/archivedependencies.py'
--- lib/lp/soyuz/adapters/archivedependencies.py	2010-02-26 13:42:51 +0000
+++ lib/lp/soyuz/adapters/archivedependencies.py	2010-05-12 11:01:39 +0000
@@ -168,7 +168,7 @@
 
     # Consider user-selected archive dependencies.
     primary_component = get_primary_current_component(
-        build.archive, build.distroseries, sourcepackagename)
+        build.archive, build.distro_series, sourcepackagename)
     for archive_dependency in build.archive.dependencies:
         # When the dependency component is undefined, we should use
         # the component where the source is published in the primary
@@ -272,7 +272,7 @@
     primary_dependencies = []
     for pocket in primary_pockets:
         primary_dependencies.append(
-            (build.distroseries.distribution.main_archive, pocket,
+            (build.distro_series.distribution.main_archive, pocket,
              primary_components))
 
     return primary_dependencies
 
=== modified file 'lib/lp/soyuz/doc/archive-dependencies.txt'
--- lib/lp/soyuz/doc/archive-dependencies.txt	2010-03-11 01:39:25 +0000
+++ lib/lp/soyuz/doc/archive-dependencies.txt	2010-05-12 11:01:39 +0000
@@ -205,8 +205,9 @@
     ...     get_sources_list_for_building)
 
     >>> def print_building_sources_list(candidate):
-    ...     sources_list = get_sources_list_for_building(candidate,
-    ...         candidate.distroarchseries, candidate.sourcepackagerelease.name)
+    ...     sources_list = get_sources_list_for_building(
+    ...     candidate, candidate.distro_arch_series,
+    ...     candidate.source_package_release.name)
     ...     for line in sources_list:
     ...         print line
 
@@ -219,7 +220,7 @@
     ...     PackagePublishingStatus)
 
     >>> cprov.archive.getAllPublishedBinaries(
-    ...      distroarchseries=a_build.distroarchseries,
+    ...      distroarchseries=a_build.distro_arch_series,
     ...      status=PackagePublishingStatus.PUBLISHED).count()
     0
 
@@ -323,9 +324,9 @@
     deb http://ppa.launchpad.dev/cprov/ppa/ubuntu hoary main
     deb http://ftpmaster.internal/ubuntu hoary
         main restricted universe multiverse
-    deb http://ftpmaster.internal/ubuntu hoary-security 
+    deb http://ftpmaster.internal/ubuntu hoary-security
         main restricted universe multiverse
-    deb http://ftpmaster.internal/ubuntu hoary-updates 
+    deb http://ftpmaster.internal/ubuntu hoary-updates
         main restricted universe multiverse
 
 However, in order to avoid the problem going forward (and to allow the PPA
@@ -363,9 +364,9 @@
     deb http://ppa.launchpad.dev/cprov/ppa/ubuntu hoary main
     deb http://ftpmaster.internal/ubuntu hoary
         main restricted universe multiverse
-    deb http://ftpmaster.internal/ubuntu hoary-security 
+    deb http://ftpmaster.internal/ubuntu hoary-security
         main restricted universe multiverse
-    deb http://ftpmaster.internal/ubuntu hoary-updates 
+    deb http://ftpmaster.internal/ubuntu hoary-updates
         main restricted universe multiverse
 
 However, in order to avoid the problem going forward (and to allow the PPA
@@ -434,7 +435,7 @@
     ...     get_primary_current_component)
 
     >>> print get_primary_current_component(a_build.archive,
-    ...     a_build.distroseries, a_build.sourcepackagerelease.name)
+    ...     a_build.distro_series, a_build.source_package_release.name)
     universe
 
     >>> print_building_sources_list(a_build)
 
=== modified file 'lib/lp/soyuz/doc/archive-files.txt'
--- lib/lp/soyuz/doc/archive-files.txt	2009-08-28 07:34:44 +0000
+++ lib/lp/soyuz/doc/archive-files.txt	2010-05-12 11:01:39 +0000
@@ -191,7 +191,7 @@
     ...    'buildlog_ubuntu-breezy-autotest-i386.'
     ...    'test-pkg_1.0_FULLYBUILT.txt.gz')
     >>> buildlog = test_publisher.addMockFile(buildlog_name)
-    >>> build.buildlog = buildlog
+    >>> build.log = buildlog
 
     >>> buildlog == build.getFileByName(buildlog_name)
     True
 
=== modified file 'lib/lp/soyuz/doc/archive.txt'
--- lib/lp/soyuz/doc/archive.txt	2010-05-06 10:05:49 +0000
+++ lib/lp/soyuz/doc/archive.txt	2010-05-12 11:01:39 +0000
@@ -1047,13 +1047,13 @@
     >>> cd_lookup = cprov_archive.getBuildRecords(name='cd')
     >>> cd_lookup.count()
     1
-    >>> cd_lookup[0].sourcepackagerelease.name
+    >>> cd_lookup[0].source_package_release.name
     u'cdrkit'
 
     >>> ice_lookup = cprov_archive.getBuildRecords(name='ice')
     >>> ice_lookup.count()
     1
-    >>> ice_lookup[0].sourcepackagerelease.name
+    >>> ice_lookup[0].source_package_release.name
     u'iceweasel'
 
     >>> cprov_archive.getBuildRecords(name='foo').count()
 
=== modified file 'lib/lp/soyuz/doc/build-failedtoupload-workflow.txt'
--- lib/lp/soyuz/doc/build-failedtoupload-workflow.txt	2010-04-14 17:34:35 +0000
+++ lib/lp/soyuz/doc/build-failedtoupload-workflow.txt	2010-05-12 11:01:39 +0000
@@ -28,7 +28,7 @@
   >>> print failedtoupload_candidate.title
   i386 build of cdrkit 1.0 in ubuntu breezy-autotest RELEASE
 
-  >>> print failedtoupload_candidate.buildstate.name
+  >>> print failedtoupload_candidate.status.name
   FAILEDTOUPLOAD
 
   >>> print failedtoupload_candidate.upload_log.filename
@@ -110,7 +110,7 @@
 Let's emulate the procedure of rescuing an FAILEDTOUPLOAD build.
 A FAILEDTOUPLOAD build obviously has no binaries:
 
-  >>> print failedtoupload_candidate.buildstate.name
+  >>> print failedtoupload_candidate.status.name
   FAILEDTOUPLOAD
 
   >>> failedtoupload_candidate.binarypackages.count()
@@ -162,7 +162,7 @@
   >>> buildd_policy = getPolicy(
   ...     name='buildd',
   ...     distro=failedtoupload_candidate.distribution.name,
-  ...     distroseries=failedtoupload_candidate.distroseries.name,
+  ...     distroseries=failedtoupload_candidate.distro_series.name,
   ...     buildid=failedtoupload_candidate.id)
 
   >>> cdrkit_bin_upload = NascentUpload(
@@ -180,7 +180,7 @@
 previously stored upload_log is dereferenced (they are both updated
 during the upload processing time):
 
-  >>> print failedtoupload_candidate.buildstate.name
+  >>> print failedtoupload_candidate.status.name
   FULLYBUILT
 
   >>> print failedtoupload_candidate.upload_log
 
=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2010-05-12 11:01:28 +0000
+++ lib/lp/soyuz/model/archive.py	2010-05-12 11:01:39 +0000
@@ -882,18 +882,21 @@
         extra_exprs = []
         if not include_needsbuild:
             extra_exprs.append(
-                BinaryPackageBuild.buildstate != BuildStatus.NEEDSBUILD)
+                BuildFarmJob.status != BuildStatus.NEEDSBUILD)
 
         find_spec = (
-            BinaryPackageBuild.buildstate,
+            BuildFarmJob.status,
             Count(BinaryPackageBuild.id)
             )
-        result = store.using(BinaryPackageBuild).find(
+        result = store.using(
+            BinaryPackageBuild, PackageBuild, BuildFarmJob).find(
             find_spec,
-            BinaryPackageBuild.archive == self,
+            BinaryPackageBuild.package_build == PackageBuild.id,
+            PackageBuild.archive == self,
+            PackageBuild.build_farm_job == BuildFarmJob.id,
             *extra_exprs
-            ).group_by(BinaryPackageBuild.buildstate).order_by(
-                BinaryPackageBuild.buildstate)
+            ).group_by(BuildFarmJob.status).order_by(
+                BuildFarmJob.status)
 
         # Create a map for each count summary to a number of buildstates:
         count_map = {
 
=== modified file 'lib/lp/soyuz/model/binarypackagebuild.py'
--- lib/lp/soyuz/model/binarypackagebuild.py	2010-05-12 11:01:28 +0000
+++ lib/lp/soyuz/model/binarypackagebuild.py	2010-05-12 11:01:39 +0000
@@ -24,6 +24,8 @@
 
 from canonical.config import config
 from canonical.database.sqlbase import quote_like, SQLBase, sqlvalues
+from canonical.launchpad.browser.librarian import (
+    ProxiedLibraryFileAlias)
 from canonical.launchpad.components.decoratedresultset import (
     DecoratedResultSet)
 from canonical.launchpad.database.librarian import (
@@ -209,6 +211,17 @@
         return self.distro_arch_series.architecturetag
 
     @property
+    def log_url(self):
+        """See `IBuildFarmJob`.
+
+        Overridden here for the case of builds for distro archives,
+        currently only supported for binary package builds.
+        """
+        if self.log is None:
+            return None
+        return ProxiedLibraryFileAlias(self.log, self).http_url
+
+    @property
     def distributionsourcepackagerelease(self):
         """See `IBuild`."""
         from lp.soyuz.model.distributionsourcepackagerelease \
@@ -270,7 +283,7 @@
     def retry(self):
         """See `IBuild`."""
         assert self.can_be_retried, "Build %s cannot be retried" % self.id
-        self.buildstate = BuildStatus.NEEDSBUILD
+        self.status = BuildStatus.NEEDSBUILD
         self.datebuilt = None
         self.buildduration = None
         self.builder = None
@@ -522,15 +535,15 @@
             config.builddmaster.default_sender_address)
 
         extra_headers = {
-            'X-Launchpad-Build-State': self.buildstate.name,
+            'X-Launchpad-Build-State': self.status.name,
             'X-Launchpad-Build-Component' : self.current_component.name,
-            'X-Launchpad-Build-Arch' : self.distroarchseries.architecturetag,
+            'X-Launchpad-Build-Arch' : self.distro_arch_series.architecturetag,
             }
 
         # XXX cprov 2006-10-27: Temporary extra debug info about the
         # SPR.creator in context, to be used during the service quarantine,
         # notify_owner will be disabled to avoid *spamming* Debian people.
-        creator = self.sourcepackagerelease.creator
+        creator = self.source_package_release.creator
         extra_headers['X-Creator-Recipient'] = ",".join(
             get_contact_email_addresses(creator))
 
@@ -545,7 +558,7 @@
         #     * the package build (failure) occurred in the original
         #       archive.
         package_was_not_copied = (
-            self.archive == self.sourcepackagerelease.upload_archive)
+            self.archive == self.source_package_release.upload_archive)
 
         if package_was_not_copied and config.builddmaster.notify_owner:
             if (self.archive.is_ppa and creator.inTeam(self.archive.owner)
@@ -557,7 +570,7 @@
                 # Non-PPA notifications inform the creator regardless.
                 recipients = recipients.union(
                     get_contact_email_addresses(creator))
-            dsc_key = self.sourcepackagerelease.dscsigningkey
+            dsc_key = self.source_package_release.dscsigningkey
             if dsc_key:
                 recipients = recipients.union(
                     get_contact_email_addresses(dsc_key.owner))
@@ -596,13 +609,13 @@
         # with the state in the build worflow, maybe by having an
         # IBuild.statusReport property, which could also be used in the
         # respective page template.
-        if self.buildstate in [
+        if self.status in [
             BuildStatus.NEEDSBUILD, BuildStatus.SUPERSEDED]:
             # untouched builds
             buildduration = 'not available'
             buildlog_url = 'not available'
             builder_url = 'not available'
-        elif self.buildstate == BuildStatus.BUILDING:
+        elif self.status == BuildStatus.BUILDING:
             # build in process
             buildduration = 'not finished'
             buildlog_url = 'see builder page'
@@ -610,11 +623,11 @@
         else:
             # completed states (success and failure)
             buildduration = DurationFormatterAPI(
-                self.buildduration).approximateduration()
-            buildlog_url = self.build_log_url
+                self.date_finished - self.date_started).approximateduration()
+            buildlog_url = self.log_url
             builder_url = canonical_url(self.builder)
 
-        if self.buildstate == BuildStatus.FAILEDTOUPLOAD:
+        if self.status == BuildStatus.FAILEDTOUPLOAD:
             assert extra_info is not None, (
                 'Extra information is required for FAILEDTOUPLOAD '
                 'notifications.')
@@ -624,10 +637,10 @@
 
         template = get_email_template('build-notification.txt')
         replacements = {
-            'source_name': self.sourcepackagerelease.name,
-            'source_version': self.sourcepackagerelease.version,
-            'architecturetag': self.distroarchseries.architecturetag,
-            'build_state': self.buildstate.title,
+            'source_name': self.source_package_release.name,
+            'source_version': self.source_package_release.version,
+            'architecturetag': self.distro_arch_series.architecturetag,
+            'build_state': self.status.title,
             'build_duration': buildduration,
             'buildlog_url': buildlog_url,
             'builder_url': builder_url,
@@ -661,7 +674,7 @@
         if filename.endswith('.changes'):
             file_object = self.upload_changesfile
         elif filename.endswith('.txt.gz'):
-            file_object = self.buildlog
+            file_object = self.log
         elif filename.endswith('_log.txt'):
             file_object = self.upload_log
         elif filename.endswith('deb'):
@@ -868,7 +881,7 @@
         # and share it with ISourcePackage.getBuildRecords()
 
         # exclude gina-generated and security (dak-made) builds
-        # buildstate == FULLYBUILT && datebuilt == null
+        # status == FULLYBUILT && datebuilt == null
         if status == BuildStatus.FULLYBUILT:
             condition_clauses.append("BuildFarmJob.date_finished IS NOT NULL")
         else:
@@ -927,8 +940,8 @@
 
         # Get the MANUALDEPWAIT records for all archives.
         candidates = BinaryPackageBuild.selectBy(
-            buildstate=BuildStatus.MANUALDEPWAIT,
-            distroarchseries=distroarchseries)
+            status=BuildStatus.MANUALDEPWAIT,
+            distro_arch_series=distroarchseries)
 
         candidates_count = candidates.count()
         if candidates_count == 0:
@@ -978,7 +991,7 @@
             wanted = []
             for state in states:
                 candidates = [build for build in builds
-                                if build.buildstate == state]
+                                if build.status == state]
                 wanted.extend(candidates)
             return wanted
 
 
=== modified file 'lib/lp/soyuz/model/binarypackagerelease.py'
--- lib/lp/soyuz/model/binarypackagerelease.py	2010-04-12 11:37:48 +0000
+++ lib/lp/soyuz/model/binarypackagerelease.py	2010-05-12 11:01:39 +0000
@@ -84,17 +84,17 @@
             import DistributionSourcePackageRelease
         return DistributionSourcePackageRelease(
             distribution=self.build.distribution,
-            sourcepackagerelease=self.build.sourcepackagerelease)
+            sourcepackagerelease=self.build.source_package_release)
 
     @property
     def sourcepackagename(self):
         """See `IBinaryPackageRelease`."""
-        return self.build.sourcepackagerelease.sourcepackagename.name
+        return self.build.source_package_release.sourcepackagename.name
 
     @property
     def is_new(self):
         """See `IBinaryPackageRelease`."""
-        distroarchseries = self.build.distroarchseries
+        distroarchseries = self.build.distro_arch_series
         distroarchseries_binary_package = distroarchseries.getBinaryPackage(
             self.binarypackagename)
         return distroarchseries_binary_package.currentrelease is None
 
=== modified file 'lib/lp/soyuz/model/distributionsourcepackagerelease.py'
--- lib/lp/soyuz/model/distributionsourcepackagerelease.py	2010-04-12 08:29:02 +0000
+++ lib/lp/soyuz/model/distributionsourcepackagerelease.py	2010-05-12 11:01:39 +0000
@@ -16,11 +16,13 @@
 
 from storm.expr import Desc
 
+from canonical.database.sqlbase import sqlvalues
+
+from lp.buildmaster.model.buildfarmjob import BuildFarmJob
+from lp.buildmaster.model.packagebuild import PackageBuild
 from lp.soyuz.interfaces.distributionsourcepackagerelease import (
     IDistributionSourcePackageRelease)
 from lp.soyuz.interfaces.sourcepackagerelease import ISourcePackageRelease
-from canonical.database.sqlbase import sqlvalues
-
 from lp.soyuz.model.archive import Archive
 from lp.soyuz.model.binarypackagename import BinaryPackageName
 from lp.soyuz.model.binarypackagerelease import (
@@ -100,11 +102,13 @@
         # distribution that were built for a PPA but have been published
         # in a main archive.
         builds_for_distro_exprs = (
-            (BinaryPackageBuild.sourcepackagerelease ==
+            (BinaryPackageBuild.source_package_release ==
                 self.sourcepackagerelease),
-            BinaryPackageBuild.distroarchseries == DistroArchSeries.id,
+            BinaryPackageBuild.distro_arch_series == DistroArchSeries.id,
             DistroArchSeries.distroseries == DistroSeries.id,
             DistroSeries.distribution == self.distribution,
+            BinaryPackageBuild.package_build == PackageBuild.id,
+            PackageBuild.build_farm_job == BuildFarmJob.id
             )
 
         # First, get all the builds built in a main archive (this will
@@ -112,7 +116,7 @@
         builds_built_in_main_archives = store.find(
             BinaryPackageBuild,
             builds_for_distro_exprs,
-            BinaryPackageBuild.archive == Archive.id,
+            PackageBuild.archive == Archive.id,
             Archive.purpose.is_in(MAIN_ARCHIVE_PURPOSES))
 
         # Next get all the builds that have a binary published in the
@@ -132,7 +136,7 @@
         return builds_built_in_main_archives.union(
             builds_published_in_main_archives).order_by(
                 Desc(
-                    BinaryPackageBuild.datecreated), Desc(BinaryPackageBuild.id))
+                    BuildFarmJob.date_created), Desc(BinaryPackageBuild.id))
 
     @property
     def binary_package_names(self):
 
=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py	2010-05-12 11:01:28 +0000
+++ lib/lp/soyuz/model/publishing.py	2010-05-12 11:01:39 +0000
@@ -439,15 +439,16 @@
                 BinaryPackageRelease.id AND
             BinaryPackagePublishingHistory.distroarchseries=
                 DistroArchSeries.id AND
-            BinaryPackageRelease.build=Build.id AND
-            Build.sourcepackagerelease=%s AND
+            BinaryPackageRelease.build=BinaryPackageBuild.id AND
+            BinaryPackageBuild.source_package_release=%s AND
             DistroArchSeries.distroseries=%s AND
             BinaryPackagePublishingHistory.archive=%s AND
             BinaryPackagePublishingHistory.pocket=%s
         """ % sqlvalues(self.sourcepackagerelease, self.distroseries,
                         self.archive, self.pocket)
 
-        clauseTables = ['Build', 'BinaryPackageRelease', 'DistroArchSeries']
+        clauseTables = [
+            'BinaryPackageBuild', 'BinaryPackageRelease', 'DistroArchSeries']
         orderBy = ['-BinaryPackagePublishingHistory.id']
         preJoins = ['binarypackagerelease']
 
@@ -565,7 +566,7 @@
         # Check DistroArchSeries database IDs because the object belongs
         # to different transactions (architecture_available is cached).
         if (build_candidate is not None and
-            (build_candidate.distroarchseries.id == arch.id or
+            (build_candidate.distro_arch_series.id == arch.id or
              build_candidate.buildstate == BuildStatus.FULLYBUILT)):
             return None
 
@@ -869,7 +870,7 @@
     def buildIndexStanzaFields(self):
         """See `IPublishing`."""
         bpr = self.binarypackagerelease
-        spr = bpr.build.sourcepackagerelease
+        spr = bpr.build.source_package_release
 
         # binaries have only one file, the DEB
         bin_file = bpr.files[0]
 
=== modified file 'lib/lp/soyuz/model/queue.py'
--- lib/lp/soyuz/model/queue.py	2010-04-22 16:39:05 +0000
+++ lib/lp/soyuz/model/queue.py	2010-05-12 11:01:39 +0000
@@ -509,7 +509,7 @@
         for queue_source in self.sources:
             names.append(queue_source.sourcepackagerelease.name)
         for queue_build in self.builds:
-            names.append(queue_build.build.sourcepackagerelease.name)
+            names.append(queue_build.build.source_package_release.name)
         for queue_custom in self.customfiles:
             names.append(queue_custom.libraryfilealias.filename)
         # Make sure the list items have a whitespace separator so
@@ -1413,7 +1413,7 @@
     def publish(self, logger=None):
         """See `IPackageUploadBuild`."""
         # Determine the build's architecturetag
-        build_archtag = self.build.distroarchseries.architecturetag
+        build_archtag = self.build.distro_arch_series.architecturetag
         # Determine the target arch series.
         # This will raise NotFoundError if anything odd happens.
         target_dar = self.packageupload.distroseries[build_archtag]
 
=== modified file 'lib/lp/soyuz/model/sourcepackagerelease.py'
--- lib/lp/soyuz/model/sourcepackagerelease.py	2010-05-12 11:01:28 +0000
+++ lib/lp/soyuz/model/sourcepackagerelease.py	2010-05-12 11:01:39 +0000
@@ -146,12 +146,14 @@
         # a build may well have a different archive to the corresponding
         # sourcepackagerelease.
         return BinaryPackageBuild.select("""
-            sourcepackagerelease = %s AND
-            archive.id = build.archive AND
+            source_package_release = %s AND
+            package_build = packagebuild.id AND
+            archive.id = packagebuild.archive AND
+            packagebuild.build_farm_job = buildfarmjob.id AND
             archive.purpose IN %s
             """ % sqlvalues(self.id, MAIN_ARCHIVE_PURPOSES),
-            orderBy=['-datecreated', 'id'],
-            clauseTables=['Archive'])
+            orderBy=['-buildfarmjob.date_created', 'id'],
+            clauseTables=['Archive', 'PackageBuild', 'BuildFarmJob'])
 
     @property
     def age(self):
@@ -173,7 +175,7 @@
     @property
     def needs_building(self):
         for build in self._cached_builds:
-            if build.buildstate in [BuildStatus.NEEDSBUILD,
+            if build.status in [BuildStatus.NEEDSBUILD,
                                     BuildStatus.MANUALDEPWAIT,
                                     BuildStatus.CHROOTWAIT]:
                 return True
 
=== modified file 'lib/lp/soyuz/tests/test_binarypackagebuild.py'
--- lib/lp/soyuz/tests/test_binarypackagebuild.py	2010-05-12 11:01:28 +0000
+++ lib/lp/soyuz/tests/test_binarypackagebuild.py	2010-05-12 11:01:39 +0000
@@ -60,6 +60,34 @@
         self.failIfEqual(None, bq.processor)
         self.failUnless(bq, self.build.buildqueue_record)
 
+    def addFakeBuildLog(self):
+        lfa = self.factory.makeLibraryFileAlias('mybuildlog.txt')
+        removeSecurityProxy(self.build).log = lfa
+
+    def test_log_url(self):
+        # The log URL for a binary package build will use
+        # the distribution source package release when the context
+        # is not a PPA or a copy archive.
+        self.addFakeBuildLog()
+        self.failUnlessEqual(
+            'http://launchpad.dev/ubuntutest/+source/'
+            'gedit/666/+build/%d/+files/mybuildlog.txt' % (
+                self.build.package_build.build_farm_job.id),
+            self.build.log_url)
+
+    def test_log_url_ppa(self):
+        # On the other hand, ppa or copy builds will have a url in the
+        # context of the archive.
+        self.addFakeBuildLog()
+        ppa_owner = self.factory.makePerson(name="joe")
+        removeSecurityProxy(self.build).archive = self.factory.makeArchive(
+            owner=ppa_owner, name="myppa")
+        self.failUnlessEqual(
+            'http://launchpad.dev/~joe/'
+            '+archive/myppa/+build/%d/+files/mybuildlog.txt' % (
+                self.build.build_farm_job.id),
+            self.build.log_url)
+
 
 class TestBuildUpdateDependencies(TestCaseWithFactory):
 
 
=== modified file 'lib/lp/soyuz/tests/test_packageupload.py'
--- lib/lp/soyuz/tests/test_packageupload.py	2010-03-24 11:58:07 +0000
+++ lib/lp/soyuz/tests/test_packageupload.py	2010-05-12 11:01:39 +0000
@@ -273,7 +273,7 @@
             'main/dist-upgrader-all')
         self.assertEquals(
             ['20060302.0120', 'current'], sorted(os.listdir(custom_path)))
-        
+
         # The custom files were also copied to the public librarian
         for customfile in delayed_copy.customfiles:
             self.assertFalse(customfile.libraryfilealias.restricted)
@@ -300,7 +300,7 @@
         [pub_record] = pub_records
         [build] = pub_record.getBuilds()
         self.assertEquals(
-            BuildStatus.NEEDSBUILD, build.buildstate)
+            BuildStatus.NEEDSBUILD, build.status)
 
     def test_realiseUpload_for_overridden_component_archive(self):
         # If the component of an upload is overridden to 'Partner' for