Merge lp:~al-maisan/launchpad/refactoring-479079 into lp:launchpad/db-devel

[Muharem Hrnjadovic]

[Muharem Hrnjadovic (al-maisan)]

Hello there!

This is a follow-up branch to the schema (and sample data) changes required
for the Soyuz buildd generalisation. It refactors the code in the python
domain to cope with the schema changes.

For more details on the Soyuz buildd generalisation
please see: https://dev.launchpad.net/Soyuz/Specs/BuilddGeneralisation.

Pre-implementation call, assistance and intermediate reviews by Julian E.

Tests to run:

    bin/test -vv -t build

No pertinent lint errors or warnings.

This branch depends on the schema patch branch (lp:~al-maisan/launchpad/builddsc-478919). Just in case the diff includes the schema patch: the *real* diff is here: http://pastebin.ubuntu.com/317945/

[Julian Edwards (julian-edwards)]

Phew! What a change, thanks for staying late and getting this done Muharem.
There's a few things to fix; you're already aware of some that I mentioned on IRC. More inline!

> === modified file 'lib/lp/buildmaster/buildergroup.py'
> --- lib/lp/buildmaster/buildergroup.py 2009-08-16 12:38:12 +0000
> +++ lib/lp/buildmaster/buildergroup.py 2009-11-13 16:42:17 +0000
> @@ -130,8 +130,9 @@
> try:
> build = getUtility(IBuildSet).getByBuildID(int(build_id))
> queue_item = getUtility(IBuildQueueSet).get(int(queue_item_id))
> - # Also check it build and buildqueue are properly related.
> - if queue_item.build.id != build.id:
> + queued_build = getUtility(IBuildSet).getByQueueEntry(queue_item)
> + # Also check whether build and buildqueue are properly related.
> + if queued_build.id != build.id:
> raise BuildJobMismatch('Job build entry mismatch')
>
> except (SQLObjectNotFound, NotFoundError, BuildJobMismatch), reason:
> @@ -159,9 +160,10 @@
>
> Invoke getFileFromSlave method with 'buildlog' identifier.
> """
> + build = getUtility(IBuildSet).getByQueueEntry(queueItem)
> return queueItem.builder.transferSlaveFileToLibrarian(
> 'buildlog', queueItem.getLogFileName(),
> - queueItem.build.archive.private)
> + build.archive.private)
>
> def updateBuild(self, queueItem):
> """Verify the current build job status.
> @@ -199,7 +201,7 @@
> "Unknown status code (%s) returned from status() probe."
> % builder_status)
> queueItem.builder = None
> - queueItem.buildstart = None
> + queueItem.setDateStarted(None)
> self.commit()
> return
>
> @@ -261,17 +263,18 @@
>
> Store Buildlog, datebuilt, duration, dependencies.
> """
> - queueItem.build.buildlog = self.getLogFromSlave(queueItem)
> - queueItem.build.builder = queueItem.builder
> - queueItem.build.dependencies = dependencies
> + build = getUtility(IBuildSet).getByQueueEntry(queueItem)
> + build.buildlog = self.getLogFromSlave(queueItem)
> + build.builder = queueItem.builder
> + build.dependencies = dependencies
> # XXX cprov 20060615 bug=120584: Currently buildduration includes
> # the scanner latency, it should really be asking the slave for
> # the duration spent building locally.
> - queueItem.build.datebuilt = UTC_NOW
> + build.datebuilt = UTC_NOW
> # We need dynamic datetime.now() instance to be able to perform
> # the time operations for duration.
> RIGHT_NOW = datetime.datetime.now(pytz.timezone('UTC'))
> - queueItem.build.buildduration = RIGHT_NOW - queueItem.buildstart
> + build.buildduration = RIGHT_NOW - queueItem.job.date_started

Since you added buildqueue.setDateStarted, it makes sense to have a property
buildqueue.date_started so it's consistent.

> def buildStatus_OK(self, queueItem, librarian, buildid,
> @@ -287,7 +290,7 @@
> self.logger....

review: Needs Fixing (code)

[Muharem Hrnjadovic (al-maisan)]

Julian Edwards wrote:
> Review: Needs Fixing code
> Phew! What a change, thanks for staying late and getting this done
> Muharem. There's a few things to fix; you're already aware of some
> that I mentioned on IRC. More inline!

Hello Julian,

thanks for reviewing this monster branch :P
Please see my responses below as well as the enclosed incremental diff.

>> === modified file 'lib/lp/buildmaster/buildergroup.py'
>> --- lib/lp/buildmaster/buildergroup.py 2009-08-16 12:38:12 +0000
>> +++ lib/lp/buildmaster/buildergroup.py 2009-11-13 16:42:17 +0000
>> @@ -130,8 +130,9 @@
>> try:
>> build = getUtility(IBuildSet).getByBuildID(int(build_id))
>> queue_item = getUtility(IBuildQueueSet).get(int(queue_item_id))
>> - # Also check it build and buildqueue are properly related.
>> - if queue_item.build.id != build.id:
>> + queued_build = getUtility(IBuildSet).getByQueueEntry(queue_item)
>> + # Also check whether build and buildqueue are properly related.
>> + if queued_build.id != build.id:
>> raise BuildJobMismatch('Job build entry mismatch')
>>
>> except (SQLObjectNotFound, NotFoundError, BuildJobMismatch), reason:
>> @@ -159,9 +160,10 @@
>>
>> Invoke getFileFromSlave method with 'buildlog' identifier.
>> """
>> + build = getUtility(IBuildSet).getByQueueEntry(queueItem)
>> return queueItem.builder.transferSlaveFileToLibrarian(
>> 'buildlog', queueItem.getLogFileName(),
>> - queueItem.build.archive.private)
>> + build.archive.private)
>>
>> def updateBuild(self, queueItem):
>> """Verify the current build job status.
>> @@ -199,7 +201,7 @@
>> "Unknown status code (%s) returned from status() probe."
>> % builder_status)
>> queueItem.builder = None
>> - queueItem.buildstart = None
>> + queueItem.setDateStarted(None)
>> self.commit()
>> return
>>
>> @@ -261,17 +263,18 @@
>>
>> Store Buildlog, datebuilt, duration, dependencies.
>> """
>> - queueItem.build.buildlog = self.getLogFromSlave(queueItem)
>> - queueItem.build.builder = queueItem.builder
>> - queueItem.build.dependencies = dependencies
>> + build = getUtility(IBuildSet).getByQueueEntry(queueItem)
>> + build.buildlog = self.getLogFromSlave(queueItem)
>> + build.builder = queueItem.builder
>> + build.dependencies = dependencies
>> # XXX cprov 20060615 bug=120584: Currently buildduration includes
>> # the scanner latency, it should really be asking the slave for
>> # the duration spent building locally.
>> - queueItem.build.datebuilt = UTC_NOW
>> + build.datebuilt = UTC_NOW
>> # We need dynamic datetime.now() instance to be able to perform
>> # the time operations for duration.
>> RIGHT_NOW = datetime.datetime.now(pytz.timezone('UTC'))
>> - queueItem.build.buildduration = RIGHT_NOW - queueItem.buildstart
>> + build.buildduration = RIGHT_NOW - queueItem.jo...

[Julian Edwards (julian-edwards)]

Nice work Muharem. Just a couple of things as I mentioned on IRC:
 - you forgot to bzr add the __init__.py files in the new modules
 - s/Buildfarm/BuildFarm/

And then r=me! Land away on db-devel.

review: Approve (code)

=== modified file 'database/sampledata/current-dev.sql'
--- database/sampledata/current-dev.sql	2009-11-09 13:01:13 +0000
+++ database/sampledata/current-dev.sql	2009-11-13 20:43:23 +0000
@@ -745,6 +745,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
 ALTER TABLE account DISABLE TRIGGER ALL;
 
 INSERT INTO account (id, date_created, creation_rationale, status, date_status_set, displayname, openid_identifier, status_comment, old_openid_identifier) VALUES (1, '2005-06-06 08:59:51.591618', 8, 20, '2005-06-06 08:59:51.591618', 'Mark Shuttleworth', 'mark_oid', NULL, '123/mark');
@@ -1695,10 +1704,19 @@
 ALTER TABLE builder ENABLE TRIGGER ALL;
 
 
+ALTER TABLE buildpackagejob DISABLE TRIGGER ALL;
+
+INSERT INTO buildpackagejob (id, job, build) VALUES (1, 1, 8);
+INSERT INTO buildpackagejob (id, job, build) VALUES (2, 2, 11);
+
+
+ALTER TABLE buildpackagejob ENABLE TRIGGER ALL;
+
+
 ALTER TABLE buildqueue DISABLE TRIGGER ALL;
 
-INSERT INTO buildqueue (id, build, builder, logtail, created, buildstart, lastscore, manual) VALUES (1, 8, 1, 'Dummy sampledata entry, not processing', '2005-06-15 09:14:12.820778', '2005-06-15 09:20:12.820778', 1, false);
-INSERT INTO buildqueue (id, build, builder, logtail, created, buildstart, lastscore, manual) VALUES (2, 11, NULL, NULL, '2005-06-15 10:14:12.820778', NULL, 10, false);
+INSERT INTO buildqueue (id, builder, logtail, lastscore, manual, job, job_type) VALUES (1, 1, 'Dummy sampledata entry, not processing', 1, false, 1, 1);
+INSERT INTO buildqueue (id, builder, logtail, lastscore, manual, job, job_type) VALUES (2, NULL, NULL, 10, false, 2, 1);
 
 
 ALTER TABLE buildqueue ENABLE TRIGGER ALL;
@@ -2781,6 +2799,8 @@
 
 ALTER TABLE job DISABLE TRIGGER ALL;
 
+INSERT INTO job (id, requester, reason, status, progress, last_report_seen, next_report_due, attempt_count, max_retries, log, scheduled_start, lease_expires, date_created, date_started, date_finished) VALUES (1, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, '2005-06-15 09:14:12.820778', '2005-06-15 09:20:12.820778', NULL);
+INSERT INTO job (id, requester, reason, status, progress, last_report_seen, next_report_due, attempt_count, max_retries, log, scheduled_start, lease_expires, date_created, date_started, date_finished) VALUES (2, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, '2005-06-15 10:14:12.820778', NULL, NULL);
 
 
 ALTER TABLE job ENABLE TRIGGER ALL;
@@ -4615,6 +4635,13 @@
 ALTER TABLE packageset ENABLE TRIGGER ALL;
 
 
+ALTER TABLE packagesetgroup DISABLE TRIGGER ALL;
+
+
+
+ALTER TABLE packagesetgroup ENABLE TRIGGER ALL;
+
+
 ALTER TABLE packagesetinclusion DISABLE TRIGGER ALL;
 
 
@@ -8569,6 +8596,13 @@
 ALTER TABLE signedcodeofconduct ENABLE TRIGGER ALL;
 
 
+ALTER TABLE sourcepackageformatselection DISABLE TRIGGER ALL;
+
+
+
+ALTER TABLE sourcepackageformatselection ENABLE TRIGGER ALL;
+
+
 ALTER TABLE sourcepackagename DISABLE TRIGGER ALL;
 
 INSERT INTO sourcepackagename (id, name) VALUES (1, 'mozilla-firefox');

=== modified file 'database/sampledata/current.sql'
--- database/sampledata/current.sql	2009-11-05 10:51:36 +0000
+++ database/sampledata/current.sql	2009-11-13 20:43:23 +0000
@@ -745,6 +745,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
 ALTER TABLE account DISABLE TRIGGER ALL;
 
 INSERT INTO account (id, date_created, creation_rationale, status, date_status_set, displayname, openid_identifier, status_comment, old_openid_identifier) VALUES (11, '2005-06-06 08:59:51.591618', 8, 20, '2005-06-06 08:59:51.591618', 'Mark Shuttleworth', 'mark_oid', NULL, '123/mark');
@@ -1677,10 +1686,19 @@
 ALTER TABLE builder ENABLE TRIGGER ALL;
 
 
+ALTER TABLE buildpackagejob DISABLE TRIGGER ALL;
+
+INSERT INTO buildpackagejob (id, job, build) VALUES (1, 1, 8);
+INSERT INTO buildpackagejob (id, job, build) VALUES (2, 2, 11);
+
+
+ALTER TABLE buildpackagejob ENABLE TRIGGER ALL;
+
+
 ALTER TABLE buildqueue DISABLE TRIGGER ALL;
 
-INSERT INTO buildqueue (id, build, builder, logtail, created, buildstart, lastscore, manual) VALUES (1, 8, 1, 'Dummy sampledata entry, not processing', '2005-06-15 09:14:12.820778', '2005-06-15 09:20:12.820778', 1, false);
-INSERT INTO buildqueue (id, build, builder, logtail, created, buildstart, lastscore, manual) VALUES (2, 11, NULL, NULL, '2005-06-15 10:14:12.820778', NULL, 10, false);
+INSERT INTO buildqueue (id, builder, logtail, lastscore, manual, job, job_type) VALUES (1, 1, 'Dummy sampledata entry, not processing', 1, false, 1, 1);
+INSERT INTO buildqueue (id, builder, logtail, lastscore, manual, job, job_type) VALUES (2, NULL, NULL, 10, false, 2, 1);
 
 
 ALTER TABLE buildqueue ENABLE TRIGGER ALL;
@@ -2753,6 +2771,8 @@
 
 ALTER TABLE job DISABLE TRIGGER ALL;
 
+INSERT INTO job (id, requester, reason, status, progress, last_report_seen, next_report_due, attempt_count, max_retries, log, scheduled_start, lease_expires, date_created, date_started, date_finished) VALUES (1, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, '2005-06-15 09:14:12.820778', '2005-06-15 09:20:12.820778', NULL);
+INSERT INTO job (id, requester, reason, status, progress, last_report_seen, next_report_due, attempt_count, max_retries, log, scheduled_start, lease_expires, date_created, date_started, date_finished) VALUES (2, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, '2005-06-15 10:14:12.820778', NULL, NULL);
 
 
 ALTER TABLE job ENABLE TRIGGER ALL;
@@ -4579,6 +4599,13 @@
 ALTER TABLE packageset ENABLE TRIGGER ALL;
 
 
+ALTER TABLE packagesetgroup DISABLE TRIGGER ALL;
+
+
+
+ALTER TABLE packagesetgroup ENABLE TRIGGER ALL;
+
+
 ALTER TABLE packagesetinclusion DISABLE TRIGGER ALL;
 
 
@@ -8500,6 +8527,13 @@
 ALTER TABLE signedcodeofconduct ENABLE TRIGGER ALL;
 
 
+ALTER TABLE sourcepackageformatselection DISABLE TRIGGER ALL;
+
+
+
+ALTER TABLE sourcepackageformatselection ENABLE TRIGGER ALL;
+
+
 ALTER TABLE sourcepackagename DISABLE TRIGGER ALL;
 
 INSERT INTO sourcepackagename (id, name) VALUES (1, 'mozilla-firefox');

=== modified file 'database/schema/comments.sql'
--- database/schema/comments.sql	2009-11-02 15:33:35 +0000
+++ database/schema/comments.sql	2009-11-13 20:43:23 +0000
@@ -1531,14 +1531,13 @@
 COMMENT ON COLUMN Builder.active IS 'Whether to present or not the builder in the public list of builders avaialble. It is used to hide transient or defunct builders while they get fixed.';
 
 -- BuildQueue
-COMMENT ON TABLE BuildQueue IS 'BuildQueue: The queue of builds in progress/scheduled to run. This table is the core of the build daemon master. It lists all builds in progress or scheduled to start.';
-COMMENT ON COLUMN BuildQueue.build IS 'The build for which this queue item exists. This is how the buildd master will find all the files it needs to perform the build';
+COMMENT ON TABLE BuildQueue IS 'BuildQueue: The queue of jobs in progress/scheduled to run on the Soyuz build farm.';
 COMMENT ON COLUMN BuildQueue.builder IS 'The builder assigned to this build. Some builds will have a builder assigned to queue them up; some will be building on the specified builder already; others will not have a builder yet (NULL) and will be waiting to be assigned into a builder''s queue';
-COMMENT ON COLUMN BuildQueue.created IS 'The timestamp of the creation of this row. This is used by the buildd master scheduling algorithm to decide how soon to schedule a build to run on a given builder.';
-COMMENT ON COLUMN BuildQueue.buildstart IS 'The timestamp of the start of the build run on the given builder. If this is NULL then the build is not running yet.';
 COMMENT ON COLUMN BuildQueue.logtail IS 'The tail end of the log of the current build. This is updated regularly as the buildd master polls the buildd slaves. Once the build is complete; the full log will be lodged with the librarian and linked into the build table.';
 COMMENT ON COLUMN BuildQueue.lastscore IS 'The last score ascribed to this build record. This can be used in the UI among other places.';
 COMMENT ON COLUMN BuildQueue.manual IS 'Indicates if the current record was or not rescored manually, if so it get skipped from the auto-score procedure.';
+COMMENT ON COLUMN BuildQueue.job IS 'Foreign key to the `Job` table row with the generic job data.';
+COMMENT ON COLUMN BuildQueue.job_type IS 'Type of job (enumeration value), enables us to find/query the correct table with the data specific to this type of job.';
 
 -- Mirrors
 

=== added file 'database/schema/patch-2207-11-0.sql'
--- database/schema/patch-2207-11-0.sql	1970-01-01 00:00:00 +0000
+++ database/schema/patch-2207-11-0.sql	2009-11-13 20:43:23 +0000
@@ -0,0 +1,87 @@
+-- Copyright 2009 Canonical Ltd.  This software is licensed under the
+-- GNU Affero General Public License version 3 (see the file LICENSE).
+
+SET client_min_messages=ERROR;
+
+-- The schema patch required for the Soyuz buildd generalisation, see
+-- https://dev.launchpad.net/Soyuz/Specs/BuilddGeneralisation for details.
+-- Bug #478919.
+
+-- Step 1
+-- The `BuildPackageJob` table captures whatever data is required for
+-- "normal" Soyuz build farm jobs that build source packages.
+
+CREATE TABLE buildpackagejob (
+  id serial PRIMARY KEY,
+  -- FK to the `Job` record with "generic" data about this source package
+  -- build job. Please note that the corresponding `BuildQueue` row will
+  -- have a FK referencing the same `Job` row.
+  job integer NOT NULL CONSTRAINT buildpackagejob__job__fk REFERENCES job,
+  -- FK to the associated `Build` record.
+  build integer NOT NULL CONSTRAINT buildpackagejob__build__fk REFERENCES build
+);
+
+-- Step 2
+-- Changes needed to the `BuildQueue` table.
+
+-- The 'job' and the 'job_type' columns will enable us to find the correct
+-- database rows that hold the generic and the specific data pertaining to
+-- the job respectively.
+ALTER TABLE ONLY buildqueue ADD COLUMN job integer;
+ALTER TABLE ONLY buildqueue ADD COLUMN job_type integer NOT NULL DEFAULT 1;
+
+-- Step 3
+-- Data migration for the existing `BuildQueue` records.
+CREATE OR REPLACE FUNCTION migrate_buildqueue_rows() RETURNS integer
+LANGUAGE plpgsql AS
+$$
+DECLARE
+    queue_row RECORD;
+    job_id integer;
+    buildpackagejob_id integer;
+    rows_migrated integer;
+BEGIN
+    rows_migrated := 0;
+    FOR queue_row IN SELECT * FROM buildqueue LOOP
+        INSERT INTO job(status, date_created, date_started) VALUES(0, queue_row.created, queue_row.buildstart);
+        -- Get the key of the `Job` row just inserted.
+        SELECT currval('job_id_seq') INTO job_id;
+        INSERT INTO buildpackagejob(job, build) VALUES(job_id, queue_row.build);
+        -- Get the key of the `BuildPackageJob` row just inserted.
+        SELECT currval('buildpackagejob_id_seq') INTO buildpackagejob_id;
+        UPDATE buildqueue SET job=job_id WHERE id=queue_row.id;
+        rows_migrated := rows_migrated + 1;
+    END LOOP;
+    RETURN rows_migrated;
+END;
+$$;
+
+-- Run the data migration function.
+SELECT * FROM migrate_buildqueue_rows();
+-- The `BuildQueue` data is migrated at this point, we can get rid of the
+-- data migration function.
+DROP FUNCTION migrate_buildqueue_rows();
+
+-- Now that the data was migrated we can make the 'job' column mandatory
+-- and define the foreign key constraint for it.
+ALTER TABLE ONLY buildqueue ALTER COLUMN job SET NOT NULL;
+ALTER TABLE ONLY buildqueue
+    ADD CONSTRAINT buildqueue__job__fk
+    FOREIGN KEY (job) REFERENCES job(id);
+
+-- Step 4
+-- Now remove the obsolete columns, constraints and indexes from `BuildQueue`.
+-- The latter will from now on refer to the `Build` record via the
+-- `Job`/`BuildPackageJob` tables (and not directly any more).
+DROP INDEX buildqueue__build__idx;
+ALTER TABLE ONLY buildqueue DROP CONSTRAINT "$1";
+ALTER TABLE ONLY buildqueue DROP COLUMN build;
+ALTER TABLE ONLY buildqueue DROP COLUMN created;
+ALTER TABLE ONLY buildqueue DROP COLUMN buildstart;
+
+-- Step 5
+-- Add indexes for the new `BuildQueue` columns.
+CREATE INDEX buildqueue__job__idx ON buildqueue(job);
+CREATE INDEX buildqueue__job_type__idx ON buildqueue(job_type);
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2207, 11, 0);

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2009-11-06 01:16:21 +0000
+++ database/schema/security.cfg	2009-11-13 20:43:23 +0000
@@ -837,6 +837,8 @@
 public.archivearch                              = SELECT, UPDATE
 public.archivedependency                        = SELECT
 public.buildqueue                               = SELECT, INSERT, UPDATE, DELETE
+public.job                                      = SELECT, INSERT, UPDATE, DELETE
+public.buildpackagejob                          = SELECT, INSERT, UPDATE, DELETE
 public.builder                                  = SELECT, INSERT, UPDATE
 public.build                                    = SELECT, INSERT, UPDATE
 public.distribution                             = SELECT, UPDATE
@@ -928,6 +930,8 @@
 public.build                            = SELECT, INSERT, UPDATE
 public.builder                          = SELECT, INSERT, UPDATE
 public.buildqueue                       = SELECT, INSERT, UPDATE, DELETE
+public.job                              = SELECT, INSERT, UPDATE, DELETE
+public.buildpackagejob                  = SELECT, INSERT, UPDATE, DELETE
 public.component                        = SELECT, INSERT, UPDATE
 public.componentselection               = SELECT, INSERT, UPDATE
 public.country                          = SELECT, INSERT, UPDATE
@@ -1114,6 +1118,8 @@
 public.pocketchroot                     = SELECT
 public.build                            = SELECT, INSERT, UPDATE
 public.buildqueue                       = SELECT, INSERT, UPDATE
+public.job                              = SELECT, INSERT, UPDATE
+public.buildpackagejob                  = SELECT, INSERT, UPDATE
 
 # Thusly the librarian
 public.libraryfilecontent               = SELECT, INSERT
@@ -1195,6 +1201,8 @@
 public.distrocomponentuploader          = SELECT
 public.build                            = SELECT, INSERT, UPDATE
 public.buildqueue                       = SELECT, INSERT, UPDATE
+public.job                              = SELECT, INSERT, UPDATE
+public.buildpackagejob                  = SELECT, INSERT, UPDATE
 public.pocketchroot                     = SELECT
 public.sourcepackagerelease             = SELECT, UPDATE
 public.binarypackagerelease             = SELECT, UPDATE

=== modified file 'lib/lp/buildmaster/buildergroup.py'
--- lib/lp/buildmaster/buildergroup.py	2009-08-16 12:38:12 +0000
+++ lib/lp/buildmaster/buildergroup.py	2009-11-13 20:43:22 +0000
@@ -130,8 +130,9 @@
         try:
             build = getUtility(IBuildSet).getByBuildID(int(build_id))
             queue_item = getUtility(IBuildQueueSet).get(int(queue_item_id))
-            # Also check it build and buildqueue are properly related.
-            if queue_item.build.id != build.id:
+            queued_build = getUtility(IBuildSet).getByQueueEntry(queue_item)
+            # Also check whether build and buildqueue are properly related.
+            if queued_build.id != build.id:
                 raise BuildJobMismatch('Job build entry mismatch')
 
         except (SQLObjectNotFound, NotFoundError, BuildJobMismatch), reason:
@@ -159,9 +160,10 @@
 
         Invoke getFileFromSlave method with 'buildlog' identifier.
         """
+        build = getUtility(IBuildSet).getByQueueEntry(queueItem)
         return queueItem.builder.transferSlaveFileToLibrarian(
             'buildlog', queueItem.getLogFileName(),
-            queueItem.build.archive.private)
+            build.archive.private)
 
     def updateBuild(self, queueItem):
         """Verify the current build job status.
@@ -199,7 +201,7 @@
                 "Unknown status code (%s) returned from status() probe."
                 % builder_status)
             queueItem.builder = None
-            queueItem.buildstart = None
+            queueItem.setDateStarted(None)
             self.commit()
             return
 
@@ -261,17 +263,18 @@
 
         Store Buildlog, datebuilt, duration, dependencies.
         """
-        queueItem.build.buildlog = self.getLogFromSlave(queueItem)
-        queueItem.build.builder = queueItem.builder
-        queueItem.build.dependencies = dependencies
+        build = getUtility(IBuildSet).getByQueueEntry(queueItem)
+        build.buildlog = self.getLogFromSlave(queueItem)
+        build.builder = queueItem.builder
+        build.dependencies = dependencies
         # XXX cprov 20060615 bug=120584: Currently buildduration includes
         # the scanner latency, it should really be asking the slave for
         # the duration spent building locally.
-        queueItem.build.datebuilt = UTC_NOW
+        build.datebuilt = UTC_NOW
         # We need dynamic datetime.now() instance to be able to perform
         # the time operations for duration.
         RIGHT_NOW = datetime.datetime.now(pytz.timezone('UTC'))
-        queueItem.build.buildduration = RIGHT_NOW - queueItem.buildstart
+        build.buildduration = RIGHT_NOW - queueItem.date_started
 
 
     def buildStatus_OK(self, queueItem, librarian, buildid,
@@ -287,7 +290,7 @@
         self.logger.debug("Processing successful build %s" % buildid)
         # Explode before collect a binary that is denied in this
         # distroseries/pocket
-        build = queueItem.build
+        build = getUtility(IBuildSet).getByQueueEntry(queueItem)
         if not build.archive.allowUpdatesToReleasePocket():
             assert build.distroseries.canUploadToPocket(build.pocket), (
                 "%s (%s) can not be built for pocket %s: illegal status"
@@ -309,8 +312,9 @@
         # can be correctly found during the upload:
         #       <archive_id>/distribution_name
         # for all destination archive types.
-        archive = queueItem.build.archive
-        distribution_name = queueItem.build.distribution.name
+        build = getUtility(IBuildSet).getByQueueEntry(queueItem)
+        archive = build.archive
+        distribution_name = build.distribution.name
         target_path = '%s/%s' % (archive.id, distribution_name)
         upload_path = os.path.join(upload_dir, target_path)
         os.makedirs(upload_path)
@@ -330,10 +334,10 @@
         # add extra arguments for processing a binary upload
         extra_args = [
             "--log-file", "%s" %  uploader_logfilename,
-            "-d", "%s" % queueItem.build.distribution.name,
-            "-s", "%s" % (queueItem.build.distroseries.name +
-                          pocketsuffix[queueItem.build.pocket]),
-            "-b", "%s" % queueItem.build.id,
+            "-d", "%s" % build.distribution.name,
+            "-s", "%s" % (build.distroseries.name +
+                          pocketsuffix[build.pocket]),
+            "-b", "%s" % build.id,
             "-J", "%s" % upload_leaf,
             "%s" % root,
             ]
@@ -409,12 +413,11 @@
         # uploader about this occurrence. The failure notification will
         # also contain the information required to manually reprocess the
         # binary upload when it was the case.
-        build = getUtility(IBuildSet).getByBuildID(queueItem.build.id)
+        build = getUtility(IBuildSet).getByQueueEntry(queueItem)
         if (build.buildstate != BuildStatus.FULLYBUILT or
             build.binarypackages.count() == 0):
             self.logger.debug("Build %s upload failed." % build.id)
-            # update builder
-            queueItem.build.buildstate = BuildStatus.FAILEDTOUPLOAD
+            build.buildstate = BuildStatus.FAILEDTOUPLOAD
             # Retrieve log file content.
             possible_locations = (
                 'failed', 'failed-to-move', 'rejected', 'accepted')
@@ -434,11 +437,13 @@
                 uploader_log_content = 'Could not find upload log file'
             # Store the upload_log_contents in librarian so it can be
             # accessed by anyone with permission to see the build.
-            queueItem.build.storeUploadLog(uploader_log_content)
+            build.storeUploadLog(uploader_log_content)
             # Notify the build failure.
-            queueItem.build.notify(extra_info=uploader_log_content)
+            build.notify(extra_info=uploader_log_content)
         else:
-            self.logger.debug("Gathered build %s completely" % queueItem.name)
+            self.logger.debug(
+                "Gathered build %s completely" %
+                build.sourcepackagerelease.name)
 
         # Release the builder for another job.
         queueItem.builder.cleanSlave()
@@ -456,10 +461,11 @@
         set the job status as FAILEDTOBUILD, store available info and
         remove Buildqueue entry.
         """
-        queueItem.build.buildstate = BuildStatus.FAILEDTOBUILD
+        build = getUtility(IBuildSet).getByQueueEntry(queueItem)
+        build.buildstate = BuildStatus.FAILEDTOBUILD
         self.storeBuildInfo(queueItem, librarian, buildid, dependencies)
         queueItem.builder.cleanSlave()
-        queueItem.build.notify()
+        build.notify()
         queueItem.destroySelf()
 
     def buildStatus_DEPFAIL(self, queueItem, librarian, buildid,
@@ -470,7 +476,8 @@
         MANUALDEPWAIT, store available information, remove BuildQueue
         entry and release builder slave for another job.
         """
-        queueItem.build.buildstate = BuildStatus.MANUALDEPWAIT
+        build = getUtility(IBuildSet).getByQueueEntry(queueItem)
+        build.buildstate = BuildStatus.MANUALDEPWAIT
         self.storeBuildInfo(queueItem, librarian, buildid, dependencies)
         self.logger.critical("***** %s is MANUALDEPWAIT *****"
                              % queueItem.builder.name)
@@ -485,12 +492,13 @@
         job as CHROOTFAIL, store available information, remove BuildQueue
         and release the builder.
         """
-        queueItem.build.buildstate = BuildStatus.CHROOTWAIT
+        build = getUtility(IBuildSet).getByQueueEntry(queueItem)
+        build.buildstate = BuildStatus.CHROOTWAIT
         self.storeBuildInfo(queueItem, librarian, buildid, dependencies)
         self.logger.critical("***** %s is CHROOTWAIT *****" %
                              queueItem.builder.name)
         queueItem.builder.cleanSlave()
-        queueItem.build.notify()
+        build.notify()
         queueItem.destroySelf()
 
     def buildStatus_BUILDERFAIL(self, queueItem, librarian, buildid,
@@ -507,10 +515,11 @@
                          ("Builder returned BUILDERFAIL when asked "
                           "for its status"))
         # simply reset job
-        queueItem.build.buildstate = BuildStatus.NEEDSBUILD
+        build = getUtility(IBuildSet).getByQueueEntry(queueItem)
+        build.buildstate = BuildStatus.NEEDSBUILD
         self.storeBuildInfo(queueItem, librarian, buildid, dependencies)
         queueItem.builder = None
-        queueItem.buildstart = None
+        queueItem.setDateStarted(None)
 
     def buildStatus_GIVENBACK(self, queueItem, librarian, buildid,
                               filemap=None, dependencies=None):
@@ -522,7 +531,8 @@
         """
         self.logger.warning("***** %s is GIVENBACK by %s *****"
                             % (buildid, queueItem.builder.name))
-        queueItem.build.buildstate = BuildStatus.NEEDSBUILD
+        build = getUtility(IBuildSet).getByQueueEntry(queueItem)
+        build.buildstate = BuildStatus.NEEDSBUILD
         self.storeBuildInfo(queueItem, librarian, buildid, dependencies)
         # XXX cprov 2006-05-30: Currently this information is not
         # properly presented in the Web UI. We will discuss it in
@@ -530,7 +540,7 @@
         # to use this content. For now we just ensure it's stored.
         queueItem.builder.cleanSlave()
         queueItem.builder = None
-        queueItem.buildstart = None
+        queueItem.setDateStarted(None)
         queueItem.logtail = None
         queueItem.lastscore = 0
 

=== added directory 'lib/lp/buildmaster/interfaces'
=== added file 'lib/lp/buildmaster/interfaces/__init__.py'
=== added file 'lib/lp/buildmaster/interfaces/buildfarmjob.py'
--- lib/lp/buildmaster/interfaces/buildfarmjob.py	1970-01-01 00:00:00 +0000
+++ lib/lp/buildmaster/interfaces/buildfarmjob.py	2009-11-13 20:43:23 +0000
@@ -0,0 +1,71 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+# pylint: disable-msg=E0211,E0213
+
+"""Interface for Soyuz build farm jobs."""
+
+__metaclass__ = type
+
+__all__ = [
+    'IBuildFarmJob',
+    'BuildFarmJobType',
+    ]
+
+from zope.interface import Interface
+from lazr.enum import DBEnumeratedType, DBItem
+
+
+class BuildFarmJobType(DBEnumeratedType):
+    """Soyuz build farm job type.
+
+    An enumeration with the types of jobs that may be run on the Soyuz build
+    farm.
+    """
+
+    PACKAGEBUILD = DBItem(1, """
+        PackageBuildJob
+
+        Build a source package.
+        """)
+
+    BRANCHBUILD = DBItem(2, """
+        BranchBuildJob
+
+        Build a package from a bazaar branch.
+        """)
+
+    RECIPEBRANCHBUILD = DBItem(3, """
+        RecipeBranchBuildJob
+
+        Build a package from a bazaar branch and a recipe.
+        """)
+
+    TRANSLATION = DBItem(4, """
+        TranslationJob
+
+        Perform a translation job.
+        """)
+
+
+class IBuildFarmJob(Interface):
+    """Operations that Soyuz build farm jobs must implement."""
+
+    def score():
+        """Calculate a job score appropriate for the job type in question."""
+
+    def getLogFileName():
+        """The preferred file name for the log of this Soyuz job."""
+
+    def getName():
+        """An appropriate name for this Soyuz job."""
+
+    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."""
+

=== modified file 'lib/lp/buildmaster/master.py'
--- lib/lp/buildmaster/master.py	2009-10-26 18:40:04 +0000
+++ lib/lp/buildmaster/master.py	2009-11-13 20:43:23 +0000
@@ -280,8 +280,10 @@
             "scanActiveBuilders() found %d active build(s) to check"
             % queueItems.count())
 
+        build_set = getUtility(IBuildSet)
         for job in queueItems:
-            proc = job.archseries.processorfamily
+            build = build_set.getByQueueEntry(job)
+            proc = build.distroarchseries.processorfamily
             try:
                 builders = notes[proc]["builders"]
             except KeyError:
@@ -309,7 +311,7 @@
                           % candidates.count())
 
         for job in candidates:
-            uptodate_build = getUtility(IBuildSet).getByBuildID(job.build.id)
+            uptodate_build = getUtility(IBuildSet).getByQueueEntry(job)
             if uptodate_build.buildstate != BuildStatus.NEEDSBUILD:
                 continue
             job.score()

=== added directory 'lib/lp/buildmaster/model'
=== added file 'lib/lp/buildmaster/model/__init__.py'
=== added file 'lib/lp/buildmaster/model/buildfarmjob.py'
--- lib/lp/buildmaster/model/buildfarmjob.py	1970-01-01 00:00:00 +0000
+++ lib/lp/buildmaster/model/buildfarmjob.py	2009-11-13 20:43:23 +0000
@@ -0,0 +1,40 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+__metaclass__ = type
+__all__ = ['BuildFarmJob']
+
+
+from zope.interface import implements
+
+from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
+
+
+class BuildFarmJob:
+    """Mix-in class for `IBuildFarmJob` implementations."""
+    implements(IBuildFarmJob)
+
+    def score(self):
+        """See `IBuildFarmJob`."""
+        raise NotImplementedError
+
+    def getLogFileName(self):
+        """See `IBuildFarmJob`."""
+        raise NotImplementedError
+
+    def getName(self):
+        """See `IBuildFarmJob`."""
+        raise NotImplementedError
+
+    def jobStarted(self):
+        """See `IBuildFarmJob`."""
+        pass
+
+    def jobReset(self):
+        """See `IBuildFarmJob`."""
+        pass
+
+    def jobAborted(self):
+        """See `IBuildFarmJob`."""
+        pass
+

=== modified file 'lib/lp/buildmaster/tests/queuebuilder.txt'
--- lib/lp/buildmaster/tests/queuebuilder.txt	2009-10-26 18:40:04 +0000
+++ lib/lp/buildmaster/tests/queuebuilder.txt	2009-11-13 20:43:23 +0000
@@ -229,7 +229,7 @@
     >>> copied_pub = pub_failed.copyTo(
     ...     hoary, PackagePublishingPocket.RELEASE, warty.main_archive)
 
-    >>> from lp.soyuz.interfaces.build import BuildStatus
+    >>> from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
     >>> failed_build = pub_failed.sourcepackagerelease.createBuild(
     ...     warty['i386'], PackagePublishingPocket.RELEASE,
     ...     warty.main_archive, status=BuildStatus.FAILEDTOBUILD)
@@ -343,7 +343,8 @@
 happen in parallel with build creation.
 
     >>> build_queue = active_jobs[0]
-    >>> print build_queue.build.title
+    >>> build = getUtility(IBuildSet).getByQueueEntry(build_queue)
+    >>> print build.title
     i386 build of test-buildd 667 in ubuntu hoary RELEASE
     >>> build_queue.lastscore
     2505
@@ -351,15 +352,15 @@
 Check the published component name retriever, they might be different,
 i.e., the published component can be different than the original component.
 
-    >>> print build_queue.build.current_component.name
+    >>> print build.current_component.name
     main
-    >>> print build_queue.build.sourcepackagerelease.component.name
+    >>> print build.sourcepackagerelease.component.name
     main
 
 Missing BuildQueue records, resulting from given-back builds, are
 created in the last stage of the queue-builder script.
 
-    >>> given_back_build = build_queue.build
+    >>> given_back_build = getUtility(IBuildSet).getByQueueEntry(build_queue)
     >>> build_queue.destroySelf()
     >>> flush_database_updates()
 

=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
--- lib/lp/buildmaster/tests/test_manager.py	2009-09-07 13:02:02 +0000
+++ lib/lp/buildmaster/tests/test_manager.py	2009-11-13 20:43:23 +0000
@@ -24,7 +24,7 @@
 from lp.buildmaster.tests.harness import BuilddManagerTestSetup
 from canonical.launchpad.ftests import ANONYMOUS, login
 from lp.soyuz.tests.soyuzbuilddhelpers import SaneBuildingSlave
-from lp.soyuz.interfaces.build import BuildStatus
+from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
 from lp.soyuz.interfaces.builder import IBuilderSet
 from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
 from lp.registry.interfaces.distribution import IDistributionSet
@@ -494,8 +494,9 @@
 
         self.assertTrue(job is not None)
         self.assertEqual(job.builder, builder)
-        self.assertTrue(job.buildstart is not None)
-        self.assertEqual(job.build.buildstate, BuildStatus.BUILDING)
+        self.assertTrue(job.date_started is not None)
+        build = getUtility(IBuildSet).getByQueueEntry(job)
+        self.assertEqual(build.buildstate, BuildStatus.BUILDING)
         self.assertEqual(job.logtail, logtail)
 
     def _getManager(self):
@@ -617,8 +618,9 @@
 
         job = getUtility(IBuildQueueSet).get(job.id)
         self.assertTrue(job.builder is None)
-        self.assertTrue(job.buildstart is None)
-        self.assertEqual(job.build.buildstate, BuildStatus.NEEDSBUILD)
+        self.assertTrue(job.date_started is None)
+        build = getUtility(IBuildSet).getByQueueEntry(job)
+        self.assertEqual(build.buildstate, BuildStatus.NEEDSBUILD)
 
     def testScanRescuesJobFromBrokenBuilder(self):
         # The job assigned to a broken builder is rescued.
@@ -701,13 +703,14 @@
         builder.builderok = True
 
         job = builder.currentjob
+        build = getUtility(IBuildSet).getByQueueEntry(job)
         self.assertEqual(
             'i386 build of mozilla-firefox 0.9 in ubuntu hoary RELEASE',
-            job.build.title)
+            build.title)
 
-        self.assertEqual('BUILDING', job.build.buildstate.name)
+        self.assertEqual('BUILDING', build.buildstate.name)
         self.assertNotEqual(None, job.builder)
-        self.assertNotEqual(None, job.buildstart)
+        self.assertNotEqual(None, job.date_started)
         self.assertNotEqual(None, job.logtail)
 
         transaction.commit()
@@ -717,9 +720,10 @@
     def assertJobIsClean(self, job_id):
         """Re-fetch the `IBuildQueue` record and check if it's clean."""
         job = getUtility(IBuildQueueSet).get(job_id)
-        self.assertEqual('NEEDSBUILD', job.build.buildstate.name)
+        build = getUtility(IBuildSet).getByQueueEntry(job)
+        self.assertEqual('NEEDSBUILD', build.buildstate.name)
         self.assertEqual(None, job.builder)
-        self.assertEqual(None, job.buildstart)
+        self.assertEqual(None, job.date_started)
         self.assertEqual(None, job.logtail)
 
     def testResetDispatchResult(self):

=== modified file 'lib/lp/registry/model/sourcepackage.py'
--- lib/lp/registry/model/sourcepackage.py	2009-10-26 18:40:04 +0000
+++ lib/lp/registry/model/sourcepackage.py	2009-11-13 20:43:23 +0000
@@ -554,8 +554,10 @@
         # It should present the builds in a more natural order.
         if build_state in [BuildStatus.NEEDSBUILD, BuildStatus.BUILDING]:
             orderBy = ["-BuildQueue.lastscore"]
+            clauseTables.append('BuildPackageJob')
+            condition_clauses.append('BuildPackageJob.build = Build.id')
             clauseTables.append('BuildQueue')
-            condition_clauses.append('BuildQueue.build = Build.id')
+            condition_clauses.append('BuildQueue.job = BuildPackageJob.job')
         elif build_state == BuildStatus.SUPERSEDED or build_state is None:
             orderBy = ["-Build.datecreated"]
         else:

=== modified file 'lib/lp/services/job/tests/test_job.py'
--- lib/lp/services/job/tests/test_job.py	2009-07-17 00:26:05 +0000
+++ lib/lp/services/job/tests/test_job.py	2009-11-13 20:43:23 +0000
@@ -8,6 +8,8 @@
 from unittest import TestLoader
 
 import pytz
+from zope.component import getUtility
+
 from canonical.database.constants import UTC_NOW
 from canonical.testing import LaunchpadZopelessLayer
 from storm.locals import Store
@@ -17,6 +19,8 @@
 from lp.services.job.interfaces.job import IJob, JobStatus
 from lp.testing import TestCase
 from canonical.launchpad.webapp.testing import verifyObject
+from canonical.launchpad.webapp.interfaces import (
+    IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
 
 
 class TestJob(TestCase):
@@ -155,40 +159,53 @@
 
     layer = LaunchpadZopelessLayer
 
+    def _sampleData(self):
+        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
+        return list(store.execute(Job.ready_jobs))
+
     def test_ready_jobs(self):
         """Job.ready_jobs should include new jobs."""
+        preexisting = self._sampleData()
         job = Job()
         self.assertEqual(
-            [(job.id,)], list(Store.of(job).execute(Job.ready_jobs)))
+            preexisting + [(job.id,)],
+            list(Store.of(job).execute(Job.ready_jobs)))
 
     def test_ready_jobs_started(self):
         """Job.ready_jobs should not jobs that have been started."""
+        preexisting = self._sampleData()
         job = Job(_status=JobStatus.RUNNING)
         self.assertEqual(
-            [], list(Store.of(job).execute(Job.ready_jobs)))
+            preexisting, list(Store.of(job).execute(Job.ready_jobs)))
 
     def test_ready_jobs_lease_expired(self):
         """Job.ready_jobs should include jobs with expired leases."""
+        preexisting = self._sampleData()
         UNIX_EPOCH = datetime.fromtimestamp(0, pytz.timezone('UTC'))
         job = Job(lease_expires=UNIX_EPOCH)
         self.assertEqual(
-            [(job.id,)], list(Store.of(job).execute(Job.ready_jobs)))
+            preexisting + [(job.id,)],
+            list(Store.of(job).execute(Job.ready_jobs)))
 
     def test_ready_jobs_lease_in_future(self):
         """Job.ready_jobs should not include jobs with active leases."""
+        preexisting = self._sampleData()
         future = datetime.fromtimestamp(
             time.time() + 1000, pytz.timezone('UTC'))
         job = Job(lease_expires=future)
-        self.assertEqual([], list(Store.of(job).execute(Job.ready_jobs)))
+        self.assertEqual(
+            preexisting, list(Store.of(job).execute(Job.ready_jobs)))
 
     def test_ready_jobs_not_jobs_scheduled_in_future(self):
         """Job.ready_jobs does not included jobs scheduled for a time in the
         future.
         """
+        preexisting = self._sampleData()
         future = datetime.fromtimestamp(
             time.time() + 1000, pytz.timezone('UTC'))
         job = Job(scheduled_start=future)
-        self.assertEqual([], list(Store.of(job).execute(Job.ready_jobs)))
+        self.assertEqual(
+            preexisting, list(Store.of(job).execute(Job.ready_jobs)))
 
     def test_acquireLease(self):
         """Job.acquireLease should set job.lease_expires."""

=== modified file 'lib/lp/soyuz/browser/build.py'
--- lib/lp/soyuz/browser/build.py	2009-10-26 18:40:04 +0000
+++ lib/lp/soyuz/browser/build.py	2009-11-13 20:43:23 +0000
@@ -288,10 +288,10 @@
     prefetched_data = dict()
     build_ids = [build.id for build in builds]
     results = getUtility(IBuildQueueSet).getForBuilds(build_ids)
-    for (buildqueue, builder) in results:
+    for (buildqueue, _builder, build_job) in results:
         # Get the build's id, 'buildqueue', 'sourcepackagerelease' and
         # 'buildlog' (from the result set) respectively.
-        prefetched_data[buildqueue.build.id] = buildqueue
+        prefetched_data[build_job.build.id] = buildqueue
 
     complete_builds = []
     for build in builds:

=== modified file 'lib/lp/soyuz/browser/builder.py'
--- lib/lp/soyuz/browser/builder.py	2009-09-17 14:45:15 +0000
+++ lib/lp/soyuz/browser/builder.py	2009-11-13 20:43:23 +0000
@@ -237,12 +237,12 @@
     def current_build_duration(self):
         """Return the delta representing the duration of the current job."""
         if (self.context.currentjob is None or
-            self.context.currentjob.buildstart is None):
+            self.context.currentjob.date_started is None):
             return None
         else:
             UTC = pytz.timezone('UTC')
-            buildstart = self.context.currentjob.buildstart
-            return datetime.datetime.now(UTC) - buildstart
+            date_started = self.context.currentjob.date_started
+            return datetime.datetime.now(UTC) - date_started
 
     @property
     def page_title(self):

=== modified file 'lib/lp/soyuz/browser/tests/builder-views.txt'
--- lib/lp/soyuz/browser/tests/builder-views.txt	2009-09-16 19:06:48 +0000
+++ lib/lp/soyuz/browser/tests/builder-views.txt	2009-11-13 20:43:23 +0000
@@ -1,7 +1,7 @@
 = Builder View Classes and Pages =
 
     >>> from zope.component import getMultiAdapter, getUtility
-    >>> from canonical.launchpad.interfaces import IBuilderSet
+    >>> from canonical.launchpad.interfaces import IBuildSet, IBuilderSet
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
 
     >>> builder = getUtility(IBuilderSet).get(1)
@@ -158,7 +158,8 @@
     >>> frog = getUtility(IBuilderSet)['frog']
     >>> frog.builderok = True
     >>> private_build.builder = frog
-    >>> private_job = BuildQueue(build=private_build, builder=frog)
+    >>> private_job = private_build.createBuildQueueEntry()
+    >>> private_job.builder = frog
     >>> private_job_id = private_job.id
 
     >>> from canonical.database.sqlbase import flush_database_caches
@@ -175,7 +176,9 @@
     >>> print frog.builderok
     True
 
-    >>> print frog.currentjob.build.title
+    >>> build_set = getUtility(IBuildSet)
+    >>> build = build_set.getByQueueEntry(frog.currentjob)
+    >>> print build.title
     i386 build of privacy-test 666 in ubuntutest breezy-autotest RELEASE
 
     >>> print frog.failnotes
@@ -199,7 +202,8 @@
     >>> print admin_view.context.builderok
     True
 
-    >>> print admin_view.context.currentjob.build.title
+    >>> build = build_set.getByQueueEntry(admin_view.context.currentjob)
+    >>> print build.title
     i386 build of privacy-test 666 in ubuntutest breezy-autotest RELEASE
 
     >>> print admin_view.context.failnotes
@@ -211,7 +215,7 @@
 
     >>> import datetime
     >>> import pytz
-    >>> private_job.buildstart = (
+    >>> private_job.setDateStarted(
     ...     datetime.datetime.now(pytz.UTC) - datetime.timedelta(10))
     >>> print admin_view.current_build_duration
     10 days...

=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml	2009-11-09 17:59:18 +0000
+++ lib/lp/soyuz/configure.zcml	2009-11-13 20:43:23 +0000
@@ -560,7 +560,7 @@
 
         <require
             permission="zope.Public"
-            set_attributes="lastscore builder buildstart logtail"/>
+            set_attributes="lastscore builder logtail date_started"/>
     </class>
 
     <!-- BuildQueueSet -->
@@ -863,5 +863,11 @@
             interface="lp.soyuz.interfaces.packagesetgroup.IPackagesetGroup"/>
     </class>
 
+    <!-- BuildPackageJob -->
+    <class
+        class="lp.soyuz.model.buildpackagejob.BuildPackageJob">
+        <allow
+            interface="lp.soyuz.interfaces.buildpackagejob.IBuildPackageJob"/>
+    </class>
 
 </configure>

=== modified file 'lib/lp/soyuz/doc/build-estimated-dispatch-time.txt'
--- lib/lp/soyuz/doc/build-estimated-dispatch-time.txt	2009-08-28 07:34:44 +0000
+++ lib/lp/soyuz/doc/build-estimated-dispatch-time.txt	2009-11-13 20:43:22 +0000
@@ -59,7 +59,8 @@
     >>> UTC = pytz.timezone('UTC')
     >>> bob_the_builder = builder_set.get(1)
     >>> cur_bqueue = bob_the_builder.currentjob
-    >>> cur_build = cur_bqueue.build
+    >>> from lp.soyuz.interfaces.build import IBuildSet
+    >>> cur_build = getUtility(IBuildSet).getByQueueEntry(cur_bqueue)
 
 Make sure the job at hand is currently being built.
 
@@ -73,16 +74,16 @@
 of job N in the build queue. These values will now be set for the job
 that is currently building.
 
+    >>> from zope.security.proxy import removeSecurityProxy
     >>> cur_bqueue.lastscore = 1111
-    >>> cur_bqueue.buildstart = datetime(2008, 4, 1, 10, 45, 39,
-    ...                                  tzinfo=UTC)
-    >>> print cur_bqueue.buildstart
+    >>> cur_bqueue.setDateStarted(
+    ...     datetime(2008, 4, 1, 10, 45, 39, tzinfo=UTC))
+    >>> print cur_bqueue.date_started
     2008-04-01 10:45:39+00:00
 
 Please note that the "estimated build duration" is an internal property
 and not meant to be viewed or modified by an end user.
 
-    >>> from zope.security.proxy import removeSecurityProxy
     >>> naked_build = removeSecurityProxy(cur_build)
     >>> naked_build.estimated_build_duration = timedelta(minutes=56)
 

=== modified file 'lib/lp/soyuz/doc/buildd-dispatching.txt'
--- lib/lp/soyuz/doc/buildd-dispatching.txt	2009-10-14 08:20:40 +0000
+++ lib/lp/soyuz/doc/buildd-dispatching.txt	2009-11-13 20:43:23 +0000
@@ -134,18 +134,20 @@
 
     >>> job.id
     2
-    >>> job.build.buildstate.name
+    >>> from lp.soyuz.interfaces.build import IBuildSet
+    >>> build = getUtility(IBuildSet).getByQueueEntry(job)
+    >>> build.buildstate.name
     'NEEDSBUILD'
     >>> job.builder is None
     True
-    >>> job.buildstart is None
+    >>> job.date_started is None
     True
-    >>> job.is_virtualized
+    >>> build.is_virtualized
     False
 
 The build start time is not set yet either.
 
-    >>> print job.build.date_first_dispatched
+    >>> print build.date_first_dispatched
     None
 
 Update the SourcePackageReleaseFile corresponding to this job:
@@ -154,7 +156,7 @@
     >>> alias_id = librarian_client.addFile(
     ...    'foo.dsc', len(content), StringIO(content), 'application/dsc')
 
-    >>> sprf = job.build.sourcepackagerelease.files[0]
+    >>> sprf = build.sourcepackagerelease.files[0]
     >>> from zope.security.proxy import removeSecurityProxy
     >>> naked_sprf = removeSecurityProxy(sprf)
     >>> naked_sprf.libraryfile = getUtility(ILibraryFileAliasSet)[alias_id]
@@ -167,35 +169,20 @@
 
 Verify if the job (BuildQueue) was updated appropriately:
 
-    >>> def checkTimes(expected, actual):
-    ...     if expected != actual:
-    ...         return "expected: %s, actual: %s" % (expected, actual)
-    ...     else:
-    ...         return "OK"
-
     >>> job.builder.id == bob_builder.id
     True
 
-    >>> job.build.buildstate.name
+    >>> build = getUtility(IBuildSet).getByQueueEntry(job)
+    >>> build.buildstate.name
     'BUILDING'
 
-    >>> from canonical.database.sqlbase import get_transaction_timestamp
-    >>> checkTimes(get_transaction_timestamp(), job.buildstart)
-    'OK'
-
-The build start time will be set to the same value.
-
-    >>> checkTimes(get_transaction_timestamp(),
-    ...            job.build.date_first_dispatched)
-    'OK'
-
 Shutdown builder, mark the build record as failed and remove the
 buildqueue record, so the build was eliminated:
 
     >>> BuilddSlaveTestSetup().tearDown()
 
     >>> from lp.soyuz.interfaces.build import BuildStatus
-    >>> job.build.buildstate = BuildStatus.FAILEDTOBUILD
+    >>> build.buildstate = BuildStatus.FAILEDTOBUILD
     >>> job.destroySelf()
     >>> flush_database_updates()
 
@@ -217,12 +204,13 @@
     3
     >>> ppa_job.builder == None
     True
-    >>> ppa_job.buildstart == None
+    >>> ppa_job.date_started == None
     True
 
 The build job's archive requires virtualized builds.
 
-    >>> ppa_job.build.archive.require_virtualized
+    >>> build = getUtility(IBuildSet).getByQueueEntry(ppa_job)
+    >>> build.archive.require_virtualized
     True
 
 But the builder is not virtualized.
@@ -249,10 +237,10 @@
     >>> from lp.soyuz.model.publishing import (
     ...     SourcePackagePublishingHistory)
     >>> [old_pub] = SourcePackagePublishingHistory.selectBy(
-    ...    distroseries=ppa_job.build.distroseries,
-    ...    sourcepackagerelease=ppa_job.build.sourcepackagerelease)
+    ...    distroseries=build.distroseries,
+    ...    sourcepackagerelease=build.sourcepackagerelease)
     >>> new_pub = old_pub.copyTo(
-    ...     old_pub.distroseries, old_pub.pocket, ppa_job.build.archive)
+    ...     old_pub.distroseries, old_pub.pocket, build.archive)
 
     >>> bob_builder.virtualized = True
     >>> syncUpdate(bob_builder)
@@ -293,19 +281,16 @@
     >>> ppa_job.builder.name
     u'bob'
 
-    >>> ppa_job.build.buildstate.name
+    >>> build.buildstate.name
     'BUILDING'
 
-    >>> ppa_job.buildstart == get_transaction_timestamp()
-    True
-
 Shutdown builder slave, mark the ppa build record as failed, remove the
 buildqueue record and make 'bob' builder non-virtual again,  so the
 environment is back to the initial state.
 
     >>> BuilddSlaveTestSetup().tearDown()
 
-    >>> ppa_job.build.buildstate = BuildStatus.FAILEDTOBUILD
+    >>> build.buildstate = BuildStatus.FAILEDTOBUILD
     >>> ppa_job.destroySelf()
     >>> bob_builder.virtualized = False
     >>> flush_database_updates()
@@ -332,9 +317,9 @@
     4
     >>> print sec_job.builder
     None
-    >>> print sec_job.buildstart
+    >>> print sec_job.date_started
     None
-    >>> sec_job.is_virtualized
+    >>> sec_build.is_virtualized
     False
 
 In normal conditions the next available candidate would be the job

=== modified file 'lib/lp/soyuz/doc/buildd-scoring.txt'
--- lib/lp/soyuz/doc/buildd-scoring.txt	2009-08-30 23:57:41 +0000
+++ lib/lp/soyuz/doc/buildd-scoring.txt	2009-11-13 20:43:23 +0000
@@ -49,7 +49,7 @@
     >>> def setUpBuildQueueEntry(
     ...     component_name='main', urgency=SourcePackageUrgency.HIGH,
     ...     pocket=PackagePublishingPocket.RELEASE,
-    ...     date_created=LOCAL_NOW, manual=False):
+    ...     date_created=LOCAL_NOW, manual=False, archive=None):
     ...     global version
     ...     commit()
     ...     LaunchpadZopelessLayer.switchDbUser('launchpad')
@@ -57,7 +57,7 @@
     ...        sourcename='test-build', version=str(version),
     ...        distroseries=hoary, component=component_name,
     ...        urgency=urgency, pocket=pocket,
-    ...        status=PackagePublishingStatus.PUBLISHED)
+    ...        status=PackagePublishingStatus.PUBLISHED, archive=archive)
     ...     commit()
     ...     LaunchpadZopelessLayer.switchDbUser(test_dbuser)
     ...     version += 1
@@ -65,7 +65,7 @@
     ...         hoary386, pub.pocket, pub.archive)
     ...
     ...     build_queue = build.createBuildQueueEntry()
-    ...     build_queue.created = date_created
+    ...     build_queue.job.date_created = date_created
     ...     build_queue.manual = manual
     ...
     ...     return build_queue
@@ -86,8 +86,10 @@
 
     >>> commit()
     >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
-    >>> bq0.build.archive.buildd_secret = "secret"
-    >>> bq0.build.archive.private = True
+    >>> from lp.soyuz.interfaces.build import IBuildSet
+    >>> build = getUtility(IBuildSet).getByQueueEntry(bq0)
+    >>> build.archive.buildd_secret = "secret"
+    >>> build.archive.private = True
     >>> bq0.score()
     >>> bq0.lastscore
     12515
@@ -96,19 +98,19 @@
 IArchive.relative_build_score to boost by 100 changes the lastscore value
 appropriately.
 
-    >>> bq0.build.archive.relative_build_score = 100
+    >>> build.archive.relative_build_score = 100
     >>> bq0.score()
     >>> bq0.lastscore
     12615
 
 The delta can also be negative.
 
-    >>> bq0.build.archive.relative_build_score = -100
+    >>> build.archive.relative_build_score = -100
     >>> bq0.score()
     >>> bq0.lastscore
     12415
 
-    >>> bq0.build.archive.relative_build_score = 0
+    >>> build.archive.relative_build_score = 0
     >>> LaunchpadZopelessLayer.switchDbUser(test_dbuser)
 
 
@@ -250,9 +252,15 @@
 they all have a fixed score of -10. They will get built in the order
 they were created.
 
-    >>> from canonical.launchpad.interfaces import ArchivePurpose
-    >>> bqc = setUpBuildQueueEntry()
-    >>> bqc.build.archive.purpose = ArchivePurpose.COPY
+    >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
+    >>> from canonical.launchpad.interfaces import (
+    ...     ArchivePurpose, IArchiveSet)
+    >>> copy = getUtility(IArchiveSet).new(
+    ...     owner=ubuntu.owner, purpose=ArchivePurpose.COPY,
+    ...     name='test-rebuild')
+
+    >>> bqc = setUpBuildQueueEntry(archive=copy)
+    >>> build = getUtility(IBuildSet).getByQueueEntry(bqc)
     >>> bqc.score()
     >>> bqc.lastscore
     -10

=== modified file 'lib/lp/soyuz/doc/buildd-slavescanner.txt'
--- lib/lp/soyuz/doc/buildd-slavescanner.txt	2009-11-05 10:51:36 +0000
+++ lib/lp/soyuz/doc/buildd-slavescanner.txt	2009-11-13 20:43:23 +0000
@@ -188,10 +188,11 @@
 To make testing easier we provide a convenience function to put a BuildQueue
 object into a preset fixed state:
 
+    >>> from zope.security.proxy import removeSecurityProxy
     >>> default_start = datetime.datetime(2005, 1, 1, 8, 0, 0, tzinfo=UTC)
     >>> def setupBuildQueue(build_queue, builder):
     ...      build_queue.builder = builder
-    ...      build_queue.buildstart = default_start
+    ...      build_queue.setDateStarted(default_start)
 
 Remove any previous buildmaster ROOT directory, to avoid any garbage
 lock conflict (it would be recreated automatically if necessary)
@@ -216,7 +217,7 @@
     >>> from canonical.launchpad.ftests import syncUpdate
     >>> if a_builder.currentjob is not None:
     ...     currentjob = a_builder.currentjob
-    ...     currentjob.buildstart = None
+    ...     currentjob.setDateStarted(None)
     ...     currentjob.builder = None
     ...     syncUpdate(currentjob)
 
@@ -236,17 +237,18 @@
 Do the test execution:
 
     >>> buildergroup.updateBuild(bqItem3)
-    >>> bqItem3.build.builder is not None
-    True
-    >>> bqItem3.build.datebuilt is not None
-    True
-    >>> bqItem3.build.buildduration is not None
-    True
-    >>> bqItem3.build.buildlog is not None
+    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem3)
+    >>> build.builder is not None
+    True
+    >>> build.datebuilt is not None
+    True
+    >>> build.buildduration is not None
+    True
+    >>> build.buildlog is not None
     True
     >>> check_mail_sent(last_stub_mail_count)
     True
-    >>> bqItem3.build.buildstate.title
+    >>> build.buildstate.title
     'Failed to build'
 
 Cleanup in preparation for the next test:
@@ -270,19 +272,20 @@
 
     >>> buildergroup.updateBuild(bqItem4)
     CRITICAL:root:***** bob is MANUALDEPWAIT *****
-    >>> bqItem4.build.builder is not None
-    True
-    >>> bqItem4.build.datebuilt is not None
-    True
-    >>> bqItem4.build.buildduration is not None
-    True
-    >>> bqItem4.build.buildlog is not None
+    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem4)
+    >>> build.builder is not None
+    True
+    >>> build.datebuilt is not None
+    True
+    >>> build.buildduration is not None
+    True
+    >>> build.buildlog is not None
     True
     >>> check_mail_sent(last_stub_mail_count)
     False
-    >>> bqItem4.build.dependencies
+    >>> build.dependencies
     u'baz (>= 1.0.1)'
-    >>> bqItem4.build.buildstate.title
+    >>> build.buildstate.title
     'Dependency wait'
 
 Cleanup in preparation for the next test:
@@ -302,17 +305,18 @@
     ...     WaitingSlave('BuildStatus.CHROOTFAIL'))
     >>> buildergroup.updateBuild(bqItem5)
     CRITICAL:root:***** bob is CHROOTWAIT *****
-    >>> bqItem5.build.builder is not None
-    True
-    >>> bqItem5.build.datebuilt is not None
-    True
-    >>> bqItem5.build.buildduration is not None
-    True
-    >>> bqItem5.build.buildlog is not None
+    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem5)
+    >>> build.builder is not None
+    True
+    >>> build.datebuilt is not None
+    True
+    >>> build.buildduration is not None
+    True
+    >>> build.buildlog is not None
     True
     >>> check_mail_sent(last_stub_mail_count)
     True
-    >>> bqItem5.build.buildstate.title
+    >>> build.buildstate.title
     'Chroot problem'
 
 Cleanup in preparation for the next test:
@@ -343,7 +347,8 @@
     True
     >>> check_mail_sent(last_stub_mail_count)
     False
-    >>> bqItem6.build.buildstate.title
+    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem6)
+    >>> build.buildstate.title
     'Needs building'
 
 Cleanup in preparation for the next test:
@@ -384,6 +389,8 @@
     >>> setupBuildQueue(bqItem8, a_builder)
     >>> last_stub_mail_count = len(stub.test_emails)
 
+    >>> bqItem8.builder.setSlaveForTesting(BuildingSlave())
+    >>> buildergroup.updateBuild(bqItem8)
     >>> bqItem8.builder.setSlaveForTesting(AbortedSlave())
     >>> bqItem8.builder.name
     u'bob'
@@ -445,17 +452,18 @@
 FAILEDTOUPLOAD:
 
     >>> buildergroup.updateBuild(bqItem10)
-    >>> bqItem10.build.builder is not None
-    True
-    >>> bqItem10.build.datebuilt is not None
-    True
-    >>> bqItem10.build.buildduration is not None
-    True
-    >>> bqItem10.build.buildlog is not None
+    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem10)
+    >>> build.builder is not None
+    True
+    >>> build.datebuilt is not None
+    True
+    >>> build.buildduration is not None
+    True
+    >>> build.buildlog is not None
     True
     >>> check_mail_sent(last_stub_mail_count)
     True
-    >>> bqItem10.build.buildstate.title
+    >>> build.buildstate.title
     'Failed to upload'
 
 Let's check the emails generated by this 'failure'
@@ -493,7 +501,7 @@
 output is both emailed in an immediate notification, and stored in the
 librarian for future reference.
 
-    >>> bqItem10.build.upload_log is not None
+    >>> build.upload_log is not None
     True
 
 What we can clearly notice is that the buildlog is still containing
@@ -514,16 +522,16 @@
 
     >>> bqItem10 = getUtility(IBuildSet).getByBuildID(
     ...     6).createBuildQueueEntry()
+    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem10)
 
 XXX: The pocket attribute is not intended to be changed in regular code, but
 for this test we want to change it on the fly. An alternative would be to add
 new sample data for a build that can be uploaded with binary packages attached
 to it.
 
-    >>> from zope.security.proxy import removeSecurityProxy
     >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
     >>> removeSecurityProxy(
-    ...     bqItem10.build).pocket = PackagePublishingPocket.UPDATES
+    ...     build).pocket = PackagePublishingPocket.UPDATES
     >>> setupBuildQueue(bqItem10, a_builder)
     >>> last_stub_mail_count = len(stub.test_emails)
 
@@ -535,22 +543,22 @@
 the build record to FULLYBUILT, as the process-upload would do:
 
     >>> from canonical.launchpad.interfaces import BuildStatus
-    >>> bqItem10.build.buildstate = BuildStatus.FULLYBUILT
+    >>> build.buildstate = BuildStatus.FULLYBUILT
 
 Now the updateBuild should recognize this build record as a
 Successfully built and uploaded procedure, not sending any
 notification and updating the build information:
 
     >>> buildergroup.updateBuild(bqItem10)
-    >>> bqItem10.build.builder is not None
-    True
-    >>> bqItem10.build.datebuilt is not None
-    True
-    >>> bqItem10.build.buildduration is not None
-    True
-    >>> bqItem10.build.buildlog is not None
-    True
-    >>> bqItem10.build.buildstate.title
+    >>> build.builder is not None
+    True
+    >>> build.datebuilt is not None
+    True
+    >>> build.buildduration is not None
+    True
+    >>> build.buildlog is not None
+    True
+    >>> build.buildstate.title
     'Successfully built'
     >>> check_mail_sent(last_stub_mail_count)
     False
@@ -558,7 +566,7 @@
 We do not store any build log information when the binary upload
 processing succeeded.
 
-    >>> bqItem10.build.upload_log is None
+    >>> build.upload_log is None
     True
 
 Cleanup in preparation for the next test:
@@ -585,13 +593,14 @@
 
     >>> bqItem11.builder is None
     True
-    >>> bqItem11.buildstart is None
+    >>> bqItem11.date_started is None
     True
     >>> bqItem11.lastscore
     0
     >>> check_mail_sent(last_stub_mail_count)
     False
-    >>> bqItem11.build.buildstate.title
+    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem11)
+    >>> build.buildstate.title
     'Needs building'
 
 Cleanup in preparation for the next test:
@@ -790,11 +799,11 @@
 tests.
 
     >>> current_job = a_builder.currentjob
-    >>> resurrect_build = current_job.build
+    >>> resurrect_build = getUtility(IBuildSet).getByQueueEntry(current_job)
     >>> resurrect_build.buildstate = BuildStatus.NEEDSBUILD
     >>> syncUpdate(resurrect_build)
     >>> current_job.builder = None
-    >>> current_job.buildstart = None
+    >>> current_job.setDateStarted(None)
     >>> syncUpdate(current_job)
 
 IBuilder.findCandidate also identifies if there are builds for
@@ -802,7 +811,8 @@
 corresponding build record as SUPERSEDED.
 
     >>> old_candidate = a_builder.findBuildCandidate()
-    >>> print old_candidate.build.buildstate.name
+    >>> build = getUtility(IBuildSet).getByQueueEntry(old_candidate)
+    >>> print build.buildstate.name
     NEEDSBUILD
 
 The 'candidate' is constant until we dispatch it.
@@ -814,7 +824,7 @@
 Now let's disable the archive of the associated build record and see
 whether the candidate will still be found.
 
-    >>> old_candidate.build.archive.enabled = False
+    >>> build.archive.enabled = False
     >>> new_candidate = a_builder.findBuildCandidate()
     >>> new_candidate is None
     True
@@ -823,7 +833,7 @@
 archives are ignored. Now let's re-enable that archive and the build
 candidate will be found again.
 
-    >>> old_candidate.build.archive.enabled = True
+    >>> build.archive.enabled = True
     >>> new_candidate = a_builder.findBuildCandidate()
     >>> new_candidate.id == old_candidate.id
     True
@@ -836,9 +846,9 @@
     >>> from canonical.launchpad.interfaces import PackagePublishingStatus
     >>> from canonical.testing.layers import LaunchpadZopelessLayer
 
-    >>> spr = old_candidate.build.sourcepackagerelease
+    >>> spr = build.sourcepackagerelease
     >>> secure_pub = removeSecurityProxy(
-    ...     old_candidate).build.current_source_publication.secure_record
+    ...     build).current_source_publication.secure_record
     >>> commit()
     >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
     >>> secure_pub.status = PackagePublishingStatus.SUPERSEDED
@@ -854,7 +864,7 @@
 Because the 'previous' candidate was marked as superseded, so it's not
 part of the candidates list anymore.
 
-    >>> print old_candidate.build.buildstate.name
+    >>> print build.buildstate.name
     SUPERSEDED
 
 If the candidate is for a private build whose source has not been
@@ -862,9 +872,10 @@
 published.  We need to tweak the status of the publishing record again
 to demonstrate this, and also make the archive private:
 
-    >>> source = new_candidate.build.sourcepackagerelease
+    >>> build = getUtility(IBuildSet).getByQueueEntry(new_candidate)
+    >>> source = build.sourcepackagerelease
     >>> secure_pub = removeSecurityProxy(
-    ...     new_candidate).build.current_source_publication.secure_record
+    ...     build).current_source_publication.secure_record
     >>> commit()
     >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
     >>> secure_pub.status = PackagePublishingStatus.PENDING
@@ -903,22 +914,23 @@
 
     >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
     >>> secure_pub = removeSecurityProxy(
-    ...     new_candidate).build.current_source_publication.secure_record
+    ...     build).current_source_publication.secure_record
     >>> secure_pub.status = PackagePublishingStatus.DELETED
     >>> secure_pub = removeSecurityProxy(
-    ...     new_candidate).build.current_source_publication.secure_record
+    ...     build).current_source_publication.secure_record
     >>> secure_pub.status = PackagePublishingStatus.SUPERSEDED
     >>> commit()
     >>> LaunchpadZopelessLayer.switchDbUser(config.builddmaster.dbuser)
 
-    >>> print current_job.build.buildstate.name
+    >>> build = getUtility(IBuildSet).getByQueueEntry(current_job)
+    >>> print build.buildstate.name
     NEEDSBUILD
 
     >>> another_candidate = a_builder.findBuildCandidate()
     >>> print another_candidate
     None
 
-    >>> print current_job.build.buildstate.name
+    >>> print build.buildstate.name
     SUPERSEDED
 
 We'll reset the archive back to non-private for further tests:
@@ -1147,7 +1159,8 @@
     >>> cprov_archive.private = True
     >>> cprov_archive.buildd_secret = "secret"
     >>> cprov_archive.require_virtualized = False
-    >>> for build_file in candidate.files:
+    >>> build = getUtility(IBuildSet).getByQueueEntry(candidate)
+    >>> for build_file in build.sourcepackagerelease.files:
     ...     removeSecurityProxy(build_file).libraryfile.restricted = True
     >>> commit()
     >>> LaunchpadZopelessLayer.switchDbUser(test_dbuser)
@@ -1169,7 +1182,8 @@
 archive and not the one from the PPA, which on the absence of ancestry
 defaults to 'universe'.
 
-    >>> print candidate.build.current_component.name
+    >>> build = getUtility(IBuildSet).getByQueueEntry(candidate)
+    >>> print build.current_component.name
     main
 
 This is so that the mangling tools will run over the built packages.
@@ -1196,7 +1210,7 @@
 We will create an ancestry in the primary archive target to the 'main'
 component and this time the dispatching will follow that component.
 
-    >>> sourcename = candidate.build.sourcepackagerelease.name
+    >>> sourcename = build.sourcepackagerelease.name
 
     >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
     >>> login('[e-mail]')
@@ -1227,14 +1241,14 @@
 
     >>> candidate = a_build.createBuildQueueEntry()
     >>> setupBuildQueue(candidate, a_builder)
-    >>> candidate.build.upload_log = None
+    >>> build.upload_log = None
     >>> candidate.builder.setSlaveForTesting(WaitingSlave('BuildStatus.OK'))
     >>> buildergroup.updateBuild(candidate)
 
-    >>> candidate.build.archive.private
+    >>> build.archive.private
     True
 
-    >>> lfa = candidate.build.buildlog
+    >>> lfa = build.buildlog
     >>> lfa.restricted
     True
     >>> print lfa.filename
@@ -1269,7 +1283,8 @@
 
     >>> cprov_archive.private = False
     >>> cprov_archive.require_virtualized = True
-    >>> for build_file in candidate.files:
+    >>> build = getUtility(IBuildSet).getByQueueEntry(candidate)
+    >>> for build_file in build.sourcepackagerelease.files:
     ...     removeSecurityProxy(build_file).libraryfile.restricted = False
     >>> mark_archive = getUtility(IPersonSet).getByName('mark').archive
 
@@ -1388,7 +1403,8 @@
     >>> a_builder.currentjob.destroySelf()
 
     >>> bqItem3 = a_build.createBuildQueueEntry()
-    >>> removeSecurityProxy(bqItem3.build).pocket = (
+    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem3)
+    >>> removeSecurityProxy(build).pocket = (
     ...     PackagePublishingPocket.UPDATES)
     >>> last_stub_mail_count = len(stub.test_emails)
     >>> a_builder.dispatchBuildCandidate(bqItem3)
@@ -1410,7 +1426,7 @@
     >>> a_builder.currentjob.destroySelf()
 
     >>> bqItem3 = a_build.createBuildQueueEntry()
-    >>> removeSecurityProxy(bqItem3.build).pocket = (
+    >>> removeSecurityProxy(build).pocket = (
     ...     PackagePublishingPocket.PROPOSED)
     >>> last_stub_mail_count = len(stub.test_emails)
     >>> a_builder.dispatchBuildCandidate(bqItem3)
@@ -1433,7 +1449,7 @@
     >>> a_builder.currentjob.destroySelf()
 
     >>> bqItem3 = a_build.createBuildQueueEntry()
-    >>> removeSecurityProxy(bqItem3.build).pocket = (
+    >>> removeSecurityProxy(build).pocket = (
     ...     PackagePublishingPocket.BACKPORTS)
     >>> last_stub_mail_count = len(stub.test_emails)
     >>> a_builder.dispatchBuildCandidate(bqItem3)
@@ -1456,9 +1472,9 @@
     >>> a_builder.currentjob.destroySelf()
 
     >>> bqItem3 = a_build.createBuildQueueEntry()
-    >>> removeSecurityProxy(bqItem3.build).buildstate = (
+    >>> removeSecurityProxy(build).buildstate = (
     ...     BuildStatus.NEEDSBUILD)
-    >>> removeSecurityProxy(bqItem3.build).pocket = (
+    >>> removeSecurityProxy(build).pocket = (
     ...     PackagePublishingPocket.SECURITY)
     >>> last_stub_mail_count = len(stub.test_emails)
 

=== modified file 'lib/lp/soyuz/doc/builder.txt'
--- lib/lp/soyuz/doc/builder.txt	2009-08-27 19:09:44 +0000
+++ lib/lp/soyuz/doc/builder.txt	2009-11-13 20:43:23 +0000
@@ -45,8 +45,10 @@
 
     >>> from lp.soyuz.interfaces.archive import ArchivePurpose
     >>> from zope.security.proxy import removeSecurityProxy
+    >>> from lp.soyuz.interfaces.build import IBuildSet
+    >>> build = getUtility(IBuildSet).getByQueueEntry(builder.currentjob)
     >>> builder_archive = removeSecurityProxy(
-    ...     builder.currentjob.build.archive)
+    ...     build.archive)
     >>> saved_purpose = builder_archive.purpose
     >>> builder_archive.purpose = ArchivePurpose.COPY
 

=== modified file 'lib/lp/soyuz/doc/buildqueue.txt'
--- lib/lp/soyuz/doc/buildqueue.txt	2009-08-28 07:34:44 +0000
+++ lib/lp/soyuz/doc/buildqueue.txt	2009-11-13 20:43:23 +0000
@@ -31,19 +31,21 @@
 The IBuild record related to this job is provided by the 'build'
 attribute:
 
-    >>> bq.build.id
+    >>> from lp.soyuz.interfaces.build import IBuildSet
+    >>> build = getUtility(IBuildSet).getByQueueEntry(bq)
+    >>> build.id
     8
-    >>> bq.build.buildstate.name
+    >>> build.buildstate.name
     'BUILDING'
 
 The static timestamps, representing when the record was initialised
 (inserted) and when the job was dispatched are provided as datetime
 instances:
 
-    >>> bq.created
+    >>> bq.job.date_created
     datetime.datetime(2005, 6, 15, 9, 14, 12, 820778, tzinfo=<UTC>)
 
-    >>> bq.buildstart
+    >>> bq.date_started
     datetime.datetime(2005, 6, 15, 9, 20, 12, 820778, tzinfo=<UTC>)
 
 Check Builder foreign key, which indicated which builder 'is processing'
@@ -77,29 +79,6 @@
     >>> bq.manual
     False
 
-BuildQueue provides a property which calculates the partial duration
-of the build procedure (NOW - buildstart), it's mainly used in the UI.
-
-    >>> bq.buildduration
-    datetime.timedelta(...)
-
-Some local properties inherited from related content classes:
-
-    >>> bq.archseries.id == bq.build.distroarchseries.id
-    True
-    >>> bq.urgency == bq.build.sourcepackagerelease.urgency
-    True
-    >>> bq.archhintlist == bq.build.sourcepackagerelease.architecturehintlist
-    True
-    >>> bq.name == bq.build.sourcepackagerelease.name
-    True
-    >>> bq.version == bq.build.sourcepackagerelease.version
-    True
-    >>> bq.files.count() == bq.build.sourcepackagerelease.files.count()
-    True
-    >>> bq.builddependsindep == bq.build.sourcepackagerelease.builddependsindep
-    True
-
 BuildQueue provides the name for the logfile resulting from the build:
 
     >>> bq.getLogFileName()
@@ -131,11 +110,12 @@
 
     >>> print job.builder.name
     bob
-    >>> job.buildstart is not None
+    >>> job.date_started is not None
     True
     >>> print job.logtail
     Dummy sampledata entry, not processing
-    >>> print job.build.buildstate.name
+    >>> build = getUtility(IBuildSet).getByQueueEntry(job)
+    >>> print build.buildstate.name
     BUILDING
     >>> print job.lastscore
     1
@@ -150,11 +130,11 @@
 
     >>> print job.builder
     None
-    >>> print job.buildstart
+    >>> print job.date_started
     None
     >>> print job.logtail
     None
-    >>> print job.build.buildstate.name
+    >>> print build.buildstate.name
     NEEDSBUILD
     >>> print job.lastscore
     1
@@ -169,9 +149,9 @@
 
     >>> print job.builder.name
     bob
-    >>> job.buildstart is not None
+    >>> job.date_started is not None
     True
-    >>> print job.build.buildstate.name
+    >>> print build.buildstate.name
     BUILDING
 
 
@@ -266,7 +246,7 @@
 and restricted
 
     >>> for bq in bqset.calculateCandidates(archseries):
-    ...     build = bq.build
+    ...     build = getUtility(IBuildSet).getByQueueEntry(bq)
     ...     print "%s (%s, %d)" % (build.title, bq.lastscore, bq.id)
     hppa build of pmount 0.1-2 in ubuntu hoary RELEASE (1500, 4)
     i386 build of alsa-utils 1.0.9a-4ubuntu1 in ubuntu hoary RELEASE (1000, 2)
@@ -298,7 +278,7 @@
 as intended.
 
     >>> for bq in bqset.calculateCandidates(archseries):
-    ...     build = bq.build
+    ...     build = getUtility(IBuildSet).getByQueueEntry(bq)
     ...     print "%s (%s, %d)" % (build.title, bq.lastscore, bq.id)
     hppa build of pmount 0.1-2 in ubuntu hoary RELEASE (1500, 4)
     i386 build of alsa-utils 1.0.9a-4ubuntu1 in ubuntu hoary RELEASE (1000, 2)
@@ -310,7 +290,7 @@
 
     >>> archseries = [hoary['hppa']]
     >>> for bq in bqset.calculateCandidates(archseries):
-    ...     build = bq.build
+    ...     build = getUtility(IBuildSet).getByQueueEntry(bq)
     ...     print "%s (%s, %d)" % (build.title, bq.lastscore, bq.id)
     hppa build of pmount 0.1-2 in ubuntu hoary RELEASE (1500, 4)
     hppa build of alsa-utils 1.0.9a-4 in ubuntu hoary RELEASE (500, 3)

=== modified file 'lib/lp/soyuz/interfaces/build.py'
--- lib/lp/soyuz/interfaces/build.py	2009-10-26 18:40:04 +0000
+++ lib/lp/soyuz/interfaces/build.py	2009-11-13 20:43:23 +0000
@@ -524,6 +524,13 @@
         :rtype: ``dict``.
         """
 
+    def getByQueueEntry(queue_entry):
+        """Return an IBuild instance for the given build queue entry.
+
+        Retrieve the only one possible build record associated with the given
+        build queue entry. If not found, return None.
+        """
+
 
 class IBuildRescoreForm(Interface):
     """Form for rescoring a build."""

=== added file 'lib/lp/soyuz/interfaces/buildpackagejob.py'
--- lib/lp/soyuz/interfaces/buildpackagejob.py	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/interfaces/buildpackagejob.py	2009-11-13 20:43:23 +0000
@@ -0,0 +1,34 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+# pylint: disable-msg=E0211,E0213
+
+"""BuildPackageJob interfaces."""
+
+__metaclass__ = type
+
+__all__ = [
+    'IBuildPackageJob',
+    ]
+
+from zope.schema import Int
+
+from canonical.launchpad import _
+from lazr.restful.fields import Reference
+from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
+from lp.services.job.interfaces.job import IJob
+from lp.soyuz.interfaces.build import IBuild
+
+
+class IBuildPackageJob(IBuildFarmJob):
+    """A read-only interface for build package jobs."""
+    id = Int(title=_('ID'), required=True, readonly=True)
+
+    job = Reference(
+        IJob, title=_("Job"), required=True, readonly=True,
+        description=_("Data common to all job types."))
+
+    build = Reference(
+        IBuild, title=_("Build"),
+        required=True,readonly=True,
+        description=_("Build record associated with this job."))

=== modified file 'lib/lp/soyuz/interfaces/buildqueue.py'
--- lib/lp/soyuz/interfaces/buildqueue.py	2009-06-25 04:06:00 +0000
+++ lib/lp/soyuz/interfaces/buildqueue.py	2009-11-13 20:43:23 +0000
@@ -13,6 +13,14 @@
     ]
 
 from zope.interface import Interface, Attribute
+from zope.schema import Choice, Datetime
+
+from lazr.restful.fields import Reference
+
+from canonical.launchpad import _
+from lp.buildmaster.interfaces.buildfarmjob import (
+    IBuildFarmJob, BuildFarmJobType)
+from lp.services.job.interfaces.job import IJob
 
 
 class IBuildQueue(Interface):
@@ -30,59 +38,24 @@
     """
 
     id = Attribute("Job identifier")
-    build = Attribute("The IBuild record that originated this job")
     builder = Attribute("The IBuilder instance processing this job")
-    created = Attribute("The datetime that the queue entry was created")
-    buildstart = Attribute("The datetime of the last build attempt")
     logtail = Attribute("The current tail of the log of the build")
     lastscore = Attribute("Last score to be computed for this job")
     manual = Attribute("Whether or not the job was manually scored")
 
-    # properties inherited from related Content classes.
-    archseries = Attribute(
-        "DistroArchSeries target of the IBuild releated to this job.")
-    name = Attribute(
-        "Name of the ISourcePackageRelease releated to this job.")
-    version = Attribute(
-        "Version of the ISourcePackageRelease releated to this job.")
-    files = Attribute(
-        "Collection of files related to the ISourcePackageRelease "
-        "releated to this job.")
-    urgency = Attribute(
-        "Urgency of the ISourcePackageRelease releated to this job.")
-    archhintlist = Attribute(
-        "architecturehintlist of the ISourcePackageRelease releated "
-        "to this job.")
-    builddependsindep = Attribute(
-        "builddependsindep of the ISourcePackageRelease releated to "
-        "this job.")
-    buildduration = Attribute(
-        "Duration of the job, calculated on-the-fly based on buildstart.")
-    is_virtualized = Attribute("See IBuild.is_virtualized.")
+    job = Reference(
+        IJob, title=_("Job"), required=True, readonly=True,
+        description=_("Data common to all job types."))
+
+    job_type = Choice(
+        title=_('Job type'), required=True, vocabulary=BuildFarmJobType,
+        description=_("The type of this job."))
 
     def manualScore(value):
         """Manually set a score value to a queue item and lock it."""
 
     def score():
-        """Perform scoring based on heuristic values.
-
-        Creates a 'score' (priority) value based on:
-
-         * Component: main component gets higher values
-           (main, 1000, restricted, 750, universe, 250, multiverse, 0)
-
-         * Urgency: EMERGENCY sources gets higher values
-           (EMERGENCY, 20, HIGH, 15, MEDIUM, 10, LOW, 5)
-
-         * Queue time: old records gets a relative higher priority
-           (The rate against component is something like: a 'multiverse'
-           build will be as important as a 'main' after 40 hours in queue)
-
-        This method automatically updates IBuildQueue.lastscore value and
-        skips 'manually-scored' records.
-
-        This method use any logger available in the standard logging system.
-        """
+        """The job score calculated for the job type in question."""
 
     def destroySelf():
         """Delete this entry from the database."""
@@ -121,6 +94,17 @@
         Clean the builder for another jobs.
         """
 
+    specific_job = Reference(
+        IBuildFarmJob, title=_("Job"),
+        description=_("Data and operations common to all build farm jobs."))
+
+    def setDateStarted(timestamp):
+        """Sets the date started property to the given value."""
+
+    date_started = Datetime(
+        title=_('Start time'),
+        description=_('Time when the job started.'))
+
 
 class IBuildQueueSet(Interface):
     """Launchpad Auto Build queue set handler and auxiliary methods."""
@@ -165,4 +149,3 @@
         Retrieve the build queue and related builder rows associated with the
         builds in question where they exist.
         """
-

=== modified file 'lib/lp/soyuz/model/build.py'
--- lib/lp/soyuz/model/build.py	2009-10-26 18:40:04 +0000
+++ lib/lp/soyuz/model/build.py	2009-11-13 20:43:23 +0000
@@ -18,7 +18,6 @@
 from zope.security.proxy import removeSecurityProxy
 from storm.expr import (
     Desc, In, Join, LeftJoin)
-from storm.references import Reference
 from storm.store import Store
 from sqlobject import (
     StringCol, ForeignKey, IntervalCol, SQLObjectNotFound)
@@ -46,7 +45,9 @@
     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
 from canonical.launchpad.webapp.tales import DurationFormatterAPI
 from lp.archivepublisher.utils import get_ppa_reference
+from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
 from lp.registry.interfaces.pocket import PackagePublishingPocket
+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.build import (
@@ -55,6 +56,7 @@
 from lp.soyuz.interfaces.publishing import active_publishing_status
 from lp.soyuz.model.binarypackagerelease import BinaryPackageRelease
 from lp.soyuz.model.builder import Builder
+from lp.soyuz.model.buildpackagejob import BuildPackageJob
 from lp.soyuz.model.buildqueue import BuildQueue
 from lp.soyuz.model.files import BinaryPackageFile
 from lp.soyuz.model.publishing import SourcePackagePublishingHistory
@@ -88,8 +90,6 @@
     archive = ForeignKey(foreignKey='Archive', dbName='archive', notNull=True)
     estimated_build_duration = IntervalCol(default=None)
 
-    buildqueue_record = Reference("<primary key>", BuildQueue.buildID,
-                                  on_remote=True)
     date_first_dispatched = UtcDateTimeCol(dbName='date_first_dispatched')
 
     upload_log = ForeignKey(
@@ -105,6 +105,16 @@
         return proxied_file.http_url
 
     @property
+    def buildqueue_record(self):
+        """See `IBuild`."""
+        store = Store.of(self)
+        results = store.find(
+            BuildQueue,
+            BuildPackageJob.job == BuildQueue.jobID,
+            BuildPackageJob.build == self.id)
+        return results.one()
+
+    @property
     def upload_log_url(self):
         """See `IBuild`."""
         if self.upload_log is None:
@@ -351,8 +361,10 @@
                 Archive
                 JOIN Build ON
                     Build.archive = Archive.id
+                JOIN BuildPackageJob ON
+                    Build.id = BuildPackageJob.build
                 JOIN BuildQueue ON
-                    Build.id = BuildQueue.build
+                    BuildPackageJob.job = BuildQueue.job
             WHERE
                 Build.buildstate = 0 AND
                 Build.processor = %s AND
@@ -412,16 +424,20 @@
             SELECT
                 CAST (EXTRACT(EPOCH FROM
                         (Build.estimated_build_duration -
-                        (NOW() - BuildQueue.buildstart))) AS INTEGER)
+                        (NOW() - Job.date_started))) AS INTEGER)
                     AS remainder
             FROM
                 Archive
                 JOIN Build ON
                     Build.archive = Archive.id
+                JOIN BuildPackageJob ON
+                    Build.id = BuildPackageJob.build
                 JOIN BuildQueue ON
-                    Build.id = BuildQueue.build
+                    BuildQueue.job = BuildPackageJob.job
                 JOIN Builder ON
                     Builder.id = BuildQueue.builder
+                JOIN Job ON
+                    Job.id = BuildPackageJob.job
             WHERE
                 Archive.require_virtualized = %s AND
                 Archive.enabled = TRUE AND
@@ -605,7 +621,18 @@
 
     def createBuildQueueEntry(self):
         """See `IBuild`"""
-        return BuildQueue(build=self)
+        store = Store.of(self)
+        job = Job()
+        store.add(job)
+        specific_job = BuildPackageJob()
+        specific_job.build = self.id
+        specific_job.job = job.id
+        store.add(specific_job)
+        queue_entry = BuildQueue()
+        queue_entry.job = job.id
+        queue_entry.job_type = BuildFarmJobType.PACKAGEBUILD
+        store.add(queue_entry)
+        return queue_entry
 
     def notify(self, extra_info=None):
         """See `IBuild`"""
@@ -966,7 +993,9 @@
         if status in [BuildStatus.NEEDSBUILD, BuildStatus.BUILDING]:
             orderBy = ["-BuildQueue.lastscore", "Build.id"]
             clauseTables.append('BuildQueue')
-            condition_clauses.append('BuildQueue.build = Build.id')
+            clauseTables.append('BuildPackageJob')
+            condition_clauses.append('BuildPackageJob.build = Build.id')
+            condition_clauses.append('BuildPackageJob.job = BuildQueue.job')
         elif status == BuildStatus.SUPERSEDED or status is None:
             orderBy = ["-Build.datecreated"]
         else:
@@ -1144,3 +1173,13 @@
         # this (pre_iter_hook()) method that will iterate over the
         # result set and force the query execution that way.
         return list(result_set)
+
+    def getByQueueEntry(self, queue_entry):
+        """See `IBuildSet`."""
+        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
+        result_set = store.find(
+            Build,
+            BuildPackageJob.build == Build.id,
+            BuildPackageJob.job == queue_entry.job)
+
+        return result_set.one()

=== modified file 'lib/lp/soyuz/model/builder.py'
--- lib/lp/soyuz/model/builder.py	2009-11-11 10:43:07 +0000
+++ lib/lp/soyuz/model/builder.py	2009-11-13 20:43:22 +0000
@@ -52,6 +52,7 @@
 from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
 from lp.soyuz.interfaces.publishing import (
     PackagePublishingStatus)
+from lp.soyuz.model.buildpackagejob import BuildPackageJob
 from canonical.launchpad.webapp import urlappend
 from canonical.librarian.utils import copy_and_close
 
@@ -151,11 +152,11 @@
         # Avoid circular imports.
         from lp.soyuz.model.publishing import makePoolPath
 
-        build = build_queue_item.build
+        build = getUtility(IBuildSet).getByQueueEntry(build_queue_item)
         archive = build.archive
         archive_url = archive.archive_url
         component_name = build.current_component.name
-        for source_file in build_queue_item.files:
+        for source_file in build.sourcepackagerelease.files:
             file_name = source_file.libraryfile.filename
             sha1 = source_file.libraryfile.content.sha1
             source_name = build.sourcepackagerelease.sourcepackagename.name
@@ -264,8 +265,8 @@
          * Ensure that the build pocket allows builds for the current
            distroseries state.
         """
-        assert not (not self.virtualized and
-                    build_queue_item.is_virtualized), (
+        build = getUtility(IBuildSet).getByQueueEntry(build_queue_item)
+        assert not (not self.virtualized and build.is_virtualized), (
             "Attempt to build non-virtual item on a virtual builder.")
 
         # Assert that we are not silently building SECURITY jobs.
@@ -274,27 +275,27 @@
         # XXX Julian 2007-12-18 spec=security-in-soyuz: This is being
         # addressed in the work on the blueprint:
         # https://blueprints.launchpad.net/soyuz/+spec/security-in-soyuz
-        target_pocket = build_queue_item.build.pocket
+        target_pocket = build.pocket
         assert target_pocket != PackagePublishingPocket.SECURITY, (
             "Soyuz is not yet capable of building SECURITY uploads.")
 
         # Ensure build has the needed chroot
-        chroot = build_queue_item.archseries.getChroot()
+        build = getUtility(IBuildSet).getByQueueEntry(build_queue_item)
+        chroot = build.distroarchseries.getChroot()
         if chroot is None:
             raise CannotBuild(
                 "Missing CHROOT for %s/%s/%s" % (
-                    build_queue_item.build.distroseries.distribution.name,
-                    build_queue_item.build.distroseries.name,
-                    build_queue_item.build.distroarchseries.architecturetag)
+                    build.distroseries.distribution.name,
+                    build.distroseries.name,
+                    build.distroarchseries.architecturetag)
                 )
 
         # The main distribution has policies to prevent uploads to some
         # pockets (e.g. security) during different parts of the distribution
         # series lifecycle. These do not apply to PPA builds nor any archive
         # that allows release pocket updates.
-        if (build_queue_item.build.archive.purpose != ArchivePurpose.PPA and
-            not build_queue_item.build.archive.allowUpdatesToReleasePocket()):
-            build = build_queue_item.build
+        if (build.archive.purpose != ArchivePurpose.PPA and
+            not build.archive.allowUpdatesToReleasePocket()):
             # XXX Robert Collins 2007-05-26: not an explicit CannotBuild
             # exception yet because the callers have not been audited
             assert build.distroseries.canUploadToPocket(build.pocket), (
@@ -306,7 +307,8 @@
     def _dispatchBuildToSlave(self, build_queue_item, args, buildid, logger):
         """Start the build on the slave builder."""
         # Send chroot.
-        chroot = build_queue_item.archseries.getChroot()
+        build = getUtility(IBuildSet).getByQueueEntry(build_queue_item)
+        chroot = build.distroarchseries.getChroot()
         self.cacheFileOnSlave(logger, chroot)
 
         # Build filemap structure with the files required in this build
@@ -314,11 +316,11 @@
         # If the build is private we tell the slave to get the files from the
         # archive instead of the librarian because the slaves cannot
         # access the restricted librarian.
-        private = build_queue_item.build.archive.private
+        private = build.archive.private
         if private:
             self.cachePrivateSourceOnSlave(logger, build_queue_item)
         filemap = {}
-        for source_file in build_queue_item.files:
+        for source_file in build.sourcepackagerelease.files:
             lfa = source_file.libraryfile
             filemap[lfa.filename] = lfa.content.sha1
             if not private:
@@ -349,9 +351,10 @@
 
     def startBuild(self, build_queue_item, logger):
         """See IBuilder."""
+        build = getUtility(IBuildSet).getByQueueEntry(build_queue_item)
+        spr = build.sourcepackagerelease
         logger.info("startBuild(%s, %s, %s, %s)", self.url,
-                    build_queue_item.name, build_queue_item.version,
-                    build_queue_item.build.pocket.title)
+                    spr.name, spr.version, build.pocket.title)
 
         # Make sure the request is valid; an exception is raised if it's not.
         self._verifyBuildRequest(build_queue_item, logger)
@@ -365,39 +368,39 @@
         # turn 'arch_indep' ON only if build is archindep or if
         # the specific architecture is the nominatedarchindep for
         # this distroseries (in case it requires any archindep source)
-        args['arch_indep'] = build_queue_item.archseries.isNominatedArchIndep
+        build = getUtility(IBuildSet).getByQueueEntry(build_queue_item)
+        args['arch_indep'] = build.distroarchseries.isNominatedArchIndep
 
-        suite = build_queue_item.build.distroarchseries.distroseries.name
-        if build_queue_item.build.pocket != PackagePublishingPocket.RELEASE:
-            suite += "-%s" % (build_queue_item.build.pocket.name.lower())
+        suite = build.distroarchseries.distroseries.name
+        if build.pocket != PackagePublishingPocket.RELEASE:
+            suite += "-%s" % (build.pocket.name.lower())
         args['suite'] = suite
 
-        archive_purpose = build_queue_item.build.archive.purpose
+        archive_purpose = build.archive.purpose
         if (archive_purpose == ArchivePurpose.PPA and
-            not build_queue_item.build.archive.require_virtualized):
+            not build.archive.require_virtualized):
             # If we're building a non-virtual PPA, override the purpose
             # to PRIMARY and use the primary component override.
             # This ensures that the package mangling tools will run over
             # the built packages.
             args['archive_purpose'] = ArchivePurpose.PRIMARY.name
             args["ogrecomponent"] = (
-                get_primary_current_component(build_queue_item.build))
+                get_primary_current_component(build))
         else:
             args['archive_purpose'] = archive_purpose.name
             args["ogrecomponent"] = (
-                build_queue_item.build.current_component.name)
+                build.current_component.name)
 
-        args['archives'] = get_sources_list_for_building(
-            build_queue_item.build)
+        args['archives'] = get_sources_list_for_building(build)
 
         # Let the build slave know whether this is a build in a private
         # archive.
-        args['archive_private'] = build_queue_item.build.archive.private
+        args['archive_private'] = build.archive.private
 
         # Generate a string which can be used to cross-check when obtaining
         # results so we know we are referring to the right database object in
         # subsequent runs.
-        buildid = "%s-%s" % (build_queue_item.build.id, build_queue_item.id)
+        buildid = "%s-%s" % (build.id, build_queue_item.id)
         logger.debug("Initiating build %s on %s" % (buildid, self.url))
 
         # Do it.
@@ -421,8 +424,9 @@
         if currentjob is None:
             return 'Idle'
 
-        msg = 'Building %s' % currentjob.build.title
-        archive = currentjob.build.archive
+        build = getUtility(IBuildSet).getByQueueEntry(currentjob)
+        msg = 'Building %s' % build.title
+        archive = build.archive
         if not archive.owner.private and (archive.is_ppa or archive.is_copy):
             return '%s [%s/%s]' % (msg, archive.owner.name, archive.name)
         else:
@@ -553,7 +557,8 @@
                       SourcePackagePublishingHistory.status IN %s))
               OR
               archive.private IS FALSE) AND
-            buildqueue.build = build.id AND
+            buildqueue.job = buildpackagejob.job AND
+            buildpackagejob.build = build.id AND
             build.distroarchseries = distroarchseries.id AND
             build.archive = archive.id AND
             archive.enabled = TRUE AND
@@ -563,7 +568,8 @@
         """ % sqlvalues(
             private_statuses, BuildStatus.NEEDSBUILD, self.processor.family)]
 
-        clauseTables = ['Build', 'DistroArchSeries', 'Archive']
+        clauseTables = [
+            'Build', 'BuildPackageJob', 'DistroArchSeries', 'Archive']
 
         clauses.append("""
             archive.require_virtualized = %s
@@ -605,7 +611,7 @@
 
         query = " AND ".join(clauses)
         candidate = BuildQueue.selectFirst(
-            query, clauseTables=clauseTables, prejoins=['build'],
+            query, clauseTables=clauseTables,
             orderBy=['-buildqueue.lastscore', 'build.id'])
 
         return candidate
@@ -629,26 +635,28 @@
         # Builds in those situation should not be built because they will
         # be wasting build-time, the former case already has a newer source
         # and the latter could not be built in DAK.
+        build_set = getUtility(IBuildSet)
         while candidate is not None:
-            if candidate.build.pocket == PackagePublishingPocket.SECURITY:
+            build = build_set.getByQueueEntry(candidate)
+            if build.pocket == PackagePublishingPocket.SECURITY:
                 # We never build anything in the security pocket.
                 logger.debug(
                     "Build %s FAILEDTOBUILD, queue item %s REMOVED"
-                    % (candidate.build.id, candidate.id))
-                candidate.build.buildstate = BuildStatus.FAILEDTOBUILD
+                    % (build.id, candidate.id))
+                build.buildstate = BuildStatus.FAILEDTOBUILD
                 candidate.destroySelf()
                 candidate = self._findBuildCandidate()
                 continue
 
-            publication = candidate.build.current_source_publication
+            publication = build.current_source_publication
 
             if publication is None:
                 # The build should be superseded if it no longer has a
                 # current publishing record.
                 logger.debug(
                     "Build %s SUPERSEDED, queue item %s REMOVED"
-                    % (candidate.build.id, candidate.id))
-                candidate.build.buildstate = BuildStatus.SUPERSEDED
+                    % (build.id, candidate.id))
+                build.buildstate = BuildStatus.SUPERSEDED
                 candidate.destroySelf()
                 candidate = self._findBuildCandidate()
                 continue
@@ -751,13 +759,15 @@
         origin = (
             Archive,
             Build,
+            BuildPackageJob,
             BuildQueue,
             DistroArchSeries,
             Processor,
             )
         queue = store.using(*origin).find(
             BuildQueue,
-            BuildQueue.build == Build.id,
+            BuildPackageJob.job == BuildQueue.jobID,
+            BuildPackageJob.build == Build.id,
             Build.distroarchseries == DistroArchSeries.id,
             Build.archive == Archive.id,
             DistroArchSeries.processorfamilyID == Processor.familyID,

=== added file 'lib/lp/soyuz/model/buildpackagejob.py'
--- lib/lp/soyuz/model/buildpackagejob.py	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/model/buildpackagejob.py	2009-11-13 20:43:23 +0000
@@ -0,0 +1,168 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+__metaclass__ = type
+__all__ = ['BuildPackageJob']
+
+
+from datetime import datetime
+import pytz
+
+from storm.locals import Int, Reference, Storm
+
+from zope.interface import implements
+
+from canonical.database.constants import UTC_NOW
+from canonical.launchpad.interfaces import SourcePackageUrgency
+from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
+from lp.registry.interfaces.pocket import PackagePublishingPocket
+from lp.soyuz.interfaces.archive import ArchivePurpose
+from lp.soyuz.interfaces.build import BuildStatus
+from lp.soyuz.interfaces.buildpackagejob import IBuildPackageJob
+
+
+class BuildPackageJob(Storm):
+    """See `IBuildPackageJob`."""
+    implements(IBuildFarmJob, IBuildPackageJob)
+    __storm_table__ = 'buildpackagejob'
+    id = Int(primary=True)
+
+    job_id = Int(name='job', allow_none=False)
+    job = Reference(job_id, 'Job.id')
+
+    build_id = Int(name='build', allow_none=False)
+    build = Reference(build_id, 'Build.id')
+
+    def score(self):
+        """See `IBuildPackageJob`."""
+        score_pocketname = {
+            PackagePublishingPocket.BACKPORTS: 0,
+            PackagePublishingPocket.RELEASE: 1500,
+            PackagePublishingPocket.PROPOSED: 3000,
+            PackagePublishingPocket.UPDATES: 3000,
+            PackagePublishingPocket.SECURITY: 4500,
+            }
+
+        score_componentname = {
+            'multiverse': 0,
+            'universe': 250,
+            'restricted': 750,
+            'main': 1000,
+            'partner' : 1250,
+            }
+
+        score_urgency = {
+            SourcePackageUrgency.LOW: 5,
+            SourcePackageUrgency.MEDIUM: 10,
+            SourcePackageUrgency.HIGH: 15,
+            SourcePackageUrgency.EMERGENCY: 20,
+            }
+
+        # Define a table we'll use to calculate the score based on the time
+        # in the build queue.  The table is a sorted list of (upper time
+        # limit in seconds, score) tuples.
+        queue_time_scores = [
+            (14400, 100),
+            (7200, 50),
+            (3600, 20),
+            (1800, 15),
+            (900, 10),
+            (300, 5),
+        ]
+
+        private_archive_increment = 10000
+
+        # For build jobs in rebuild archives a score value of -1
+        # was chosen because their priority is lower than build retries
+        # or language-packs. They should be built only when there is
+        # nothing else to build.
+        rebuild_archive_score = -10
+
+        score = 0
+
+        # Please note: the score for language packs is to be zero because
+        # they unduly delay the building of packages in the main component
+        # otherwise.
+        if self.build.sourcepackagerelease.section.name == 'translations':
+            pass
+        elif self.build.archive.purpose == ArchivePurpose.COPY:
+            score = rebuild_archive_score
+        else:
+            # Calculates the urgency-related part of the score.
+            urgency = score_urgency[self.build.sourcepackagerelease.urgency]
+            score += urgency
+
+            # Calculates the pocket-related part of the score.
+            score_pocket = score_pocketname[self.build.pocket]
+            score += score_pocket
+
+            # Calculates the component-related part of the score.
+            score_component = score_componentname[
+                self.build.current_component.name]
+            score += score_component
+
+            # Calculates the build queue time component of the score.
+            right_now = datetime.now(pytz.timezone('UTC'))
+            eta = right_now - self.job.date_created
+            for limit, dep_score in queue_time_scores:
+                if eta.seconds > limit:
+                    score += dep_score
+                    break
+
+            # Private builds get uber score.
+            if self.build.archive.private:
+                score += private_archive_increment
+
+            # Lastly, apply the archive score delta.  This is to boost
+            # or retard build scores for any build in a particular
+            # archive.
+            score += self.build.archive.relative_build_score
+
+        return score
+
+    def getLogFileName(self):
+        """See `IBuildPackageJob`."""
+        sourcename = self.build.sourcepackagerelease.name
+        version = self.build.sourcepackagerelease.version
+        # we rely on previous storage of current buildstate
+        # in the state handling methods.
+        state = self.build.buildstate.name
+
+        dar = self.build.distroarchseries
+        distroname = dar.distroseries.distribution.name
+        distroseriesname = dar.distroseries.name
+        archname = dar.architecturetag
+
+        # logfilename format:
+        # buildlog_<DISTRIBUTION>_<DISTROSeries>_<ARCHITECTURE>_\
+        # <SOURCENAME>_<SOURCEVERSION>_<BUILDSTATE>.txt
+        # as:
+        # buildlog_ubuntu_dapper_i386_foo_1.0-ubuntu0_FULLYBUILT.txt
+        # it fix request from bug # 30617
+        return ('buildlog_%s-%s-%s.%s_%s_%s.txt' % (
+            distroname, distroseriesname, archname, sourcename, version, state
+            ))
+
+    def getName(self):
+        """See `IBuildPackageJob`."""
+        return self.build.sourcepackagerelease.name
+
+    def jobStarted(self):
+        """See `IBuildPackageJob`."""
+        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 `IBuildPackageJob`."""
+        self.build.buildstate = BuildStatus.NEEDSBUILD
+
+    def jobAborted(self):
+        """See `IBuildPackageJob`."""
+        # XXX, al-maisan, Thu, 12 Nov 2009 16:38:52 +0100
+        # The setting below was "inherited" from the previous code. We
+        # need to investigate whether and why this is really needed and
+        # fix it.
+        self.build.buildstate = BuildStatus.BUILDING
+

=== modified file 'lib/lp/soyuz/model/buildqueue.py'
--- lib/lp/soyuz/model/buildqueue.py	2009-08-28 06:39:38 +0000
+++ lib/lp/soyuz/model/buildqueue.py	2009-11-13 20:43:23 +0000
@@ -10,27 +10,25 @@
     'BuildQueueSet'
     ]
 
-from datetime import datetime
 import logging
-import pytz
 
 from zope.component import getUtility
 from zope.interface import implements
 
 from sqlobject import (
     StringCol, ForeignKey, BoolCol, IntCol, SQLObjectNotFound)
-from storm.expr import In, LeftJoin
+from storm.expr import In, Join, LeftJoin
 
 from canonical import encoding
-from canonical.database.constants import UTC_NOW
-from canonical.database.datetimecol import UtcDateTimeCol
+from canonical.database.enumcol import EnumCol
 from canonical.database.sqlbase import SQLBase, sqlvalues
 from canonical.launchpad.webapp.interfaces import NotFoundError
-from lp.registry.interfaces.sourcepackage import SourcePackageUrgency
-from lp.soyuz.interfaces.archive import ArchivePurpose
-from lp.soyuz.interfaces.build import BuildStatus
+from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
+from lp.services.job.interfaces.job import JobStatus
+from lp.services.job.model.job import Job
+from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
 from lp.soyuz.interfaces.buildqueue import IBuildQueue, IBuildQueueSet
-from lp.registry.interfaces.pocket import PackagePublishingPocket
+from lp.soyuz.model.buildpackagejob import BuildPackageJob
 from canonical.launchpad.webapp.interfaces import (
     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
 
@@ -40,229 +38,85 @@
     _table = "BuildQueue"
     _defaultOrder = "id"
 
-    build = ForeignKey(dbName='build', foreignKey='Build', notNull=True)
+    job = ForeignKey(dbName='job', foreignKey='Job', notNull=True)
+    job_type = EnumCol(
+        enum=BuildFarmJobType, notNull=True,
+        default=BuildFarmJobType.PACKAGEBUILD, dbName='job_type')
     builder = ForeignKey(dbName='builder', foreignKey='Builder', default=None)
-    created = UtcDateTimeCol(dbName='created', default=UTC_NOW)
-    buildstart = UtcDateTimeCol(dbName='buildstart', default= None)
     logtail = StringCol(dbName='logtail', default=None)
     lastscore = IntCol(dbName='lastscore', default=0)
     manual = BoolCol(dbName='manual', default=False)
 
+    @property
+    def specific_job(self):
+        """See `IBuildQueue`."""
+        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
+        result_set = store.find(
+            BuildPackageJob, BuildPackageJob.job == self.job)
+        return result_set.one()
+
+    @property
+    def date_started(self):
+        """See `IBuildQueue`."""
+        return self.job.date_started
+
     def manualScore(self, value):
         """See `IBuildQueue`."""
         self.lastscore = value
         self.manual = True
 
-    @property
-    def archseries(self):
-        """See `IBuildQueue`."""
-        return self.build.distroarchseries
-
-    @property
-    def urgency(self):
-        """See `IBuildQueue`."""
-        return self.build.sourcepackagerelease.urgency
-
-    @property
-    def archhintlist(self):
-        """See `IBuildQueue`."""
-        return self.build.sourcepackagerelease.architecturehintlist
-
-    @property
-    def name(self):
-        """See `IBuildQueue`."""
-        return self.build.sourcepackagerelease.name
-
-    @property
-    def version(self):
-        """See `IBuildQueue`."""
-        return self.build.sourcepackagerelease.version
-
-    @property
-    def files(self):
-        """See `IBuildQueue`."""
-        return self.build.sourcepackagerelease.files
-
-    @property
-    def builddependsindep(self):
-        """See `IBuildQueue`."""
-        return self.build.sourcepackagerelease.builddependsindep
-
-    @property
-    def buildduration(self):
-        """See `IBuildQueue`."""
-        if self.buildstart:
-            UTC = pytz.timezone('UTC')
-            now = datetime.now(UTC)
-            return now - self.buildstart
-        return None
-
-    @property
-    def is_virtualized(self):
-        """See `IBuildQueue`."""
-        return self.build.is_virtualized
-
     def score(self):
         """See `IBuildQueue`."""
         # Grab any logger instance available.
         logger = logging.getLogger()
+        name = self.specific_job.getName()
 
         if self.manual:
             logger.debug(
-                "%s (%d) MANUALLY RESCORED" % (self.name, self.lastscore))
+                "%s (%d) MANUALLY RESCORED" % (name, self.lastscore))
             return
 
-        # XXX Al-maisan, 2008-05-14 (bug #230330):
-        # We keep touching the code here whenever a modification to the
-        # scoring parameters/weights is needed. Maybe the latter can be
-        # externalized?
-
-        score_pocketname = {
-            PackagePublishingPocket.BACKPORTS: 0,
-            PackagePublishingPocket.RELEASE: 1500,
-            PackagePublishingPocket.PROPOSED: 3000,
-            PackagePublishingPocket.UPDATES: 3000,
-            PackagePublishingPocket.SECURITY: 4500,
-            }
-
-        score_componentname = {
-            'multiverse': 0,
-            'universe': 250,
-            'restricted': 750,
-            'main': 1000,
-            'partner' : 1250,
-            }
-
-        score_urgency = {
-            SourcePackageUrgency.LOW: 5,
-            SourcePackageUrgency.MEDIUM: 10,
-            SourcePackageUrgency.HIGH: 15,
-            SourcePackageUrgency.EMERGENCY: 20,
-            }
-
-        # Define a table we'll use to calculate the score based on the time
-        # in the build queue.  The table is a sorted list of (upper time
-        # limit in seconds, score) tuples.
-        queue_time_scores = [
-            (14400, 100),
-            (7200, 50),
-            (3600, 20),
-            (1800, 15),
-            (900, 10),
-            (300, 5),
-        ]
-
-        private_archive_increment = 10000
-
-        # For build jobs in rebuild archives a score value of -1
-        # was chosen because their priority is lower than build retries
-        # or language-packs. They should be built only when there is
-        # nothing else to build.
-        rebuild_archive_score = -10
-
-        score = 0
-        msg = "%s (%d) -> " % (self.build.title, self.lastscore)
-
-        # Please note: the score for language packs is to be zero because
-        # they unduly delay the building of packages in the main component
-        # otherwise.
-        if self.build.sourcepackagerelease.section.name == 'translations':
-            msg += "LPack => score zero"
-        elif self.build.archive.purpose == ArchivePurpose.COPY:
-            score = rebuild_archive_score
-            msg += "Rebuild archive => -10"
-        else:
-            # Calculates the urgency-related part of the score.
-            urgency = score_urgency[self.urgency]
-            score += urgency
-            msg += "U+%d " % urgency
-
-            # Calculates the pocket-related part of the score.
-            score_pocket = score_pocketname[self.build.pocket]
-            score += score_pocket
-            msg += "P+%d " % score_pocket
-
-            # Calculates the component-related part of the score.
-            score_component = score_componentname[
-                self.build.current_component.name]
-            score += score_component
-            msg += "C+%d " % score_component
-
-            # Calculates the build queue time component of the score.
-            right_now = datetime.now(pytz.timezone('UTC'))
-            eta = right_now - self.created
-            for limit, dep_score in queue_time_scores:
-                if eta.seconds > limit:
-                    score += dep_score
-                    msg += "T+%d " % dep_score
-                    break
-            else:
-                msg += "T+0 "
-
-            # Private builds get uber score.
-            if self.build.archive.private:
-                score += private_archive_increment
-
-            # Lastly, apply the archive score delta.  This is to boost
-            # or retard build scores for any build in a particular
-            # archive.
-            score += self.build.archive.relative_build_score
-
-        # Store current score value.
-        self.lastscore = score
-
-        logger.debug("%s= %d" % (msg, self.lastscore))
+        # Allow the `IBuildFarmJob` instance with the data/logic specific to
+        # the job at hand to calculate the score as appropriate.
+        self.lastscore = self.specific_job.score()
 
     def getLogFileName(self):
         """See `IBuildQueue`."""
-        sourcename = self.build.sourcepackagerelease.name
-        version = self.build.sourcepackagerelease.version
-        # we rely on previous storage of current buildstate
-        # in the state handling methods.
-        state = self.build.buildstate.name
-
-        dar = self.build.distroarchseries
-        distroname = dar.distroseries.distribution.name
-        distroseriesname = dar.distroseries.name
-        archname = dar.architecturetag
-
-        # logfilename format:
-        # buildlog_<DISTRIBUTION>_<DISTROSeries>_<ARCHITECTURE>_\
-        # <SOURCENAME>_<SOURCEVERSION>_<BUILDSTATE>.txt
-        # as:
-        # buildlog_ubuntu_dapper_i386_foo_1.0-ubuntu0_FULLYBUILT.txt
-        # it fix request from bug # 30617
-        return ('buildlog_%s-%s-%s.%s_%s_%s.txt' % (
-            distroname, distroseriesname, archname, sourcename, version, state
-            ))
+        # Allow the `IBuildFarmJob` instance with the data/logic specific to
+        # the job at hand to calculate the log file name as appropriate.
+        return self.specific_job.getLogFileName()
 
     def markAsBuilding(self, builder):
         """See `IBuildQueue`."""
         self.builder = builder
-        self.buildstart = UTC_NOW
-        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
+        if self.job.status != JobStatus.RUNNING:
+            self.job.start()
+        self.specific_job.jobStarted()
 
     def reset(self):
         """See `IBuildQueue`."""
         self.builder = None
-        self.buildstart = None
+        if self.job.status != JobStatus.WAITING:
+            self.job.queue()
+        self.job.date_started = None
+        self.job.date_finished = None
         self.logtail = None
-        self.build.buildstate = BuildStatus.NEEDSBUILD
+        self.specific_job.jobReset()
 
     def updateBuild_IDLE(self, build_id, build_status, logtail,
                          filemap, dependencies, logger):
         """See `IBuildQueue`."""
+        build = getUtility(IBuildSet).getByQueueEntry(self)
         logger.warn(
             "Builder %s forgot about build %s -- resetting buildqueue record"
-            % (self.builder.url, self.build.title))
+            % (self.builder.url, build.title))
         self.reset()
 
     def updateBuild_BUILDING(self, build_id, build_status,
                              logtail, filemap, dependencies, logger):
         """See `IBuildQueue`."""
+        if self.job.status != JobStatus.RUNNING:
+            self.job.start()
         self.logtail = encoding.guess(str(logtail))
 
     def updateBuild_ABORTING(self, buildid, build_status,
@@ -275,8 +129,15 @@
         """See `IBuildQueue`."""
         self.builder.cleanSlave()
         self.builder = None
-        self.buildstart = None
-        self.build.buildstate = BuildStatus.BUILDING
+        if self.job.status != JobStatus.FAILED:
+            self.job.fail()
+        self.job.date_started = None
+        self.job.date_finished = None
+        self.specific_job.jobAborted()
+
+    def setDateStarted(self, timestamp):
+        """See `IBuildQueue`."""
+        self.job.date_started = timestamp
 
 
 class BuildQueueSet(object):
@@ -311,7 +172,12 @@
 
     def getActiveBuildJobs(self):
         """See `IBuildQueueSet`."""
-        return BuildQueue.select('buildstart is not null')
+        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
+        result_set = store.find(
+            BuildQueue,
+            BuildQueue.job == Job.id,
+            Job.date_started != None)
+        return result_set
 
     def calculateCandidates(self, archseries):
         """See `IBuildQueueSet`."""
@@ -323,30 +189,37 @@
         query = """
            Build.distroarchseries IN %s AND
            Build.buildstate = %s AND
-           BuildQueue.build = build.id AND
+           BuildQueue.job_type = %s AND
+           BuildQueue.job = BuildPackageJob.job AND
+           BuildPackageJob.build = build.id AND
            BuildQueue.builder IS NULL
-        """ % sqlvalues(arch_ids, BuildStatus.NEEDSBUILD)
+        """ % sqlvalues(
+            arch_ids, BuildStatus.NEEDSBUILD, BuildFarmJobType.PACKAGEBUILD)
 
         candidates = BuildQueue.select(
-            query, clauseTables=['Build'], orderBy=['-BuildQueue.lastscore'])
+            query, clauseTables=['Build', 'BuildPackageJob'],
+            orderBy=['-BuildQueue.lastscore'])
 
         return candidates
 
     def getForBuilds(self, build_ids):
         """See `IBuildQueueSet`."""
         # Avoid circular import problem.
+        from lp.soyuz.model.build import Build
         from lp.soyuz.model.builder import Builder
 
         store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
 
         origin = (
-            BuildQueue,
+            BuildPackageJob,
+            Join(BuildQueue, BuildPackageJob.job == BuildQueue.jobID),
+            Join(Build, BuildPackageJob.build == Build.id),
             LeftJoin(
                 Builder,
                 BuildQueue.builderID == Builder.id),
             )
         result_set = store.using(*origin).find(
-            (BuildQueue, Builder),
-            In(BuildQueue.buildID, build_ids))
+            (BuildQueue, Builder, BuildPackageJob),
+            In(Build.id, build_ids))
 
         return result_set

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-build-record.txt'
--- lib/lp/soyuz/stories/soyuz/xx-build-record.txt	2009-09-23 16:38:10 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-build-record.txt	2009-11-13 20:43:23 +0000
@@ -23,8 +23,9 @@
     >>> bob_builder.builderok = True
 
     # Set a known duration for the current job.
-    >>> in_progress_build = removeSecurityProxy(
-    ...     bob_builder.currentjob.build)
+    >>> from lp.soyuz.interfaces.build import IBuildSet
+    >>> build2 = getUtility(IBuildSet).getByQueueEntry(bob_builder.currentjob)
+    >>> in_progress_build = removeSecurityProxy(build2)
     >>> one_minute = datetime.timedelta(seconds=60)
     >>> in_progress_build.estimated_build_duration = one_minute
 
@@ -122,12 +123,8 @@
     >>> login('[e-mail]')
     >>> from canonical.database.constants import UTC_NOW
     >>> from lp.soyuz.interfaces.build import BuildStatus
-    >>> in_progress_build.buildstate = BuildStatus.NEEDSBUILD
-    >>> in_progress_build.buildqueue_record.buildstart = None
-    >>> in_progress_build.buildqueue_record.builder = None
-    >>> build.buildstate = BuildStatus.BUILDING
-    >>> build.buildqueue_record.buildstart = UTC_NOW
-    >>> build.buildqueue_record.builder = bob_builder
+    >>> in_progress_build.buildqueue_record.reset()
+    >>> build.buildqueue_record.markAsBuilding(bob_builder)
     >>> build.buildqueue_record.logtail = 'one line\nanother line'
     >>> logout()
 

=== modified file 'lib/lp/soyuz/templates/build-index.pt'
--- lib/lp/soyuz/templates/build-index.pt	2009-09-17 12:08:45 +0000
+++ lib/lp/soyuz/templates/build-index.pt	2009-11-13 20:43:23 +0000
@@ -161,8 +161,8 @@
       <tal:building condition="context/buildstate/enumvalue:BUILDING">
         <li>
           Started
-          <span tal:attributes="title view/buildqueue/buildstart/fmt:datetime"
-                tal:content="view/buildqueue/buildstart/fmt:approximatedate"
+          <span tal:attributes="title view/buildqueue/job/date_started/fmt:datetime"
+                tal:content="view/buildqueue/job/date_started/fmt:approximatedate"
             >5 minutes ago</span>
         </li>
       </tal:building>

=== modified file 'lib/lp/soyuz/templates/builder-index.pt'
--- lib/lp/soyuz/templates/builder-index.pt	2009-09-16 19:06:48 +0000
+++ lib/lp/soyuz/templates/builder-index.pt	2009-11-13 20:43:23 +0000
@@ -104,9 +104,14 @@
       </tal:buildernok>
     </tal:no_job>
 
+    <tal:comment replace="nothing">
+      In the very near future, 'job' will not just be a Build job.
+      The template needs to cope with that as and when new job types are
+      added.
+    </tal:comment>
     <tal:job condition="job">
       <span class="sortkey" tal:content="job/id" />
-      <tal:build define="build job/build">
+      <tal:build define="build job/specific_job/build">
         <tal:visible condition="build/required:launchpad.View">
           <tal:icon replace="structure build/image:icon" />
           Building
@@ -153,10 +158,12 @@
 
       <tal:job condition="job">
         <p class="sprite">Started
-          <span tal:attributes="title job/buildstart/fmt:datetime"
+          <span tal:attributes="title job/job/date_started/fmt:datetime"
                 tal:content="view/current_build_duration/fmt:exactduration"
             /> ago.</p>
-        <tal:visible condition="job/build/required:launchpad.View">
+        <tal:visible
+           define="build job/specific_job/build"
+           condition="build/required:launchpad.View">
           <tal:logtail condition="job/logtail">
             <h3>Buildlog</h3>
             <div tal:content="structure job/logtail/fmt:text-to-html"

=== modified file 'lib/lp/soyuz/templates/builds-list.pt'
--- lib/lp/soyuz/templates/builds-list.pt	2009-08-18 12:33:37 +0000
+++ lib/lp/soyuz/templates/builds-list.pt	2009-11-13 20:43:23 +0000
@@ -101,8 +101,8 @@
                 <tal:building condition="bq/builder">
                   Build started
                   <span
-                    tal:attributes="title bq/buildstart/fmt:datetime"
-                    tal:content="bq/buildstart/fmt:displaydate" />
+                    tal:attributes="title bq/job/date_started/fmt:datetime"
+                    tal:content="bq/job/date_started/fmt:displaydate" />
                   on
                   <a tal:content="bq/builder/title"
                      tal:attributes="href bq/builder/fmt:url"/>

=== modified file 'lib/lp/soyuz/tests/test_builder.py'
--- lib/lp/soyuz/tests/test_builder.py	2009-11-11 10:43:07 +0000
+++ lib/lp/soyuz/tests/test_builder.py	2009-11-13 20:43:23 +0000
@@ -9,8 +9,8 @@
 
 from canonical.testing import LaunchpadZopelessLayer
 from lp.soyuz.interfaces.archive import ArchivePurpose
+from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
 from lp.soyuz.interfaces.builder import IBuilderSet
-from lp.soyuz.interfaces.build import BuildStatus
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
 from lp.testing import TestCaseWithFactory
@@ -77,14 +77,16 @@
 
         # Asking frog to find a candidate should give us the joesppa build.
         next_job = self.frog_builder.findBuildCandidate()
-        self.assertEqual('joesppa', next_job.build.archive.name)
+        build = getUtility(IBuildSet).getByQueueEntry(next_job)
+        self.assertEqual('joesppa', build.archive.name)
 
         # If bob is in a failed state the joesppa build is still
         # returned.
         self.bob_builder.builderok = False
         self.bob_builder.manual = False
         next_job = self.frog_builder.findBuildCandidate()
-        self.assertEqual('joesppa', next_job.build.archive.name)
+        build = getUtility(IBuildSet).getByQueueEntry(next_job)
+        self.assertEqual('joesppa', build.archive.name)
 
 
 class TestFindBuildCandidatePPA(TestFindBuildCandidateBase):
@@ -156,14 +158,16 @@
         # A PPA cannot start a build if it would use 80% or more of the
         # builders.
         next_job = self.builder4.findBuildCandidate()
-        self.failIfEqual('joesppa', next_job.build.archive.name)
+        build = getUtility(IBuildSet).getByQueueEntry(next_job)
+        self.failIfEqual('joesppa', build.archive.name)
 
     def test_findBuildCandidate_first_build_finished(self):
         # When joe's first ppa build finishes, his fourth i386 build
         # will be the next build candidate.
         self.joe_builds[0].buildstate = BuildStatus.FAILEDTOBUILD
         next_job = self.builder4.findBuildCandidate()
-        self.failUnlessEqual('joesppa', next_job.build.archive.name)
+        build = getUtility(IBuildSet).getByQueueEntry(next_job)
+        self.failUnlessEqual('joesppa', build.archive.name)
 
     def test_findBuildCandidate_for_private_ppa(self):
         # If a ppa is private it will be able to have parallel builds
@@ -171,7 +175,8 @@
         self.ppa_joe.private = True
         self.ppa_joe.buildd_secret = 'sekrit'
         next_job = self.builder4.findBuildCandidate()
-        self.failUnlessEqual('joesppa', next_job.build.archive.name)
+        build = getUtility(IBuildSet).getByQueueEntry(next_job)
+        self.failUnlessEqual('joesppa', build.archive.name)
 
 
 class TestFindBuildCandidateDistroArchive(TestFindBuildCandidateBase):
@@ -196,18 +201,18 @@
         # arch.
 
         next_job = self.builder2.findBuildCandidate()
-        self.failUnlessEqual('primary', next_job.build.archive.name)
-        self.failUnlessEqual(
-            'gedit', next_job.build.sourcepackagerelease.name)
+        build = getUtility(IBuildSet).getByQueueEntry(next_job)
+        self.failUnlessEqual('primary', build.archive.name)
+        self.failUnlessEqual('gedit', build.sourcepackagerelease.name)
 
         # Now even if we set the build building, we'll still get the
         # second non-ppa build for the same archive as the next candidate.
-        next_job.build.buildstate = BuildStatus.BUILDING
-        next_job.build.builder = self.builder2
+        build.buildstate = BuildStatus.BUILDING
+        build.builder = self.builder2
         next_job = self.builder2.findBuildCandidate()
-        self.failUnlessEqual('primary', next_job.build.archive.name)
-        self.failUnlessEqual(
-            'firefox', next_job.build.sourcepackagerelease.name)
+        build = getUtility(IBuildSet).getByQueueEntry(next_job)
+        self.failUnlessEqual('primary', build.archive.name)
+        self.failUnlessEqual('firefox', build.sourcepackagerelease.name)
 
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)