Merge lp:~wgrant/launchpad/bug-507784 into lp:launchpad/db-devel

[William Grant]

Move BuildFarmJob.job{Started,Reset,Aborted} to PackageBuildFarmJob so SourcePackageRecipeBuilds can use them.

[William Grant (wgrant)]

BuildFarmJobs with builds have some common behaviours. This branch moves them (jobStarted, jobReset and jobAborted) into a new common base class, PackageBuildFarmJob. The name sucks, but neither I nor jml could think of anything much better.

I've also set a sane default build log filename, 'buildlog.txt'. Binary package builds will still use their insanely long custom variant.

[Julian Edwards (julian-edwards)]

Good refactoring, thanks. Class wars in the build farm...

review: Approve (code)

=== modified file 'lib/lp/buildmaster/model/buildfarmjob.py'
--- lib/lp/buildmaster/model/buildfarmjob.py	2010-01-18 22:11:00 +0000
+++ lib/lp/buildmaster/model/buildfarmjob.py	2010-01-21 02:16:16 +0000
@@ -27,7 +27,7 @@
 
     def getLogFileName(self):
         """See `IBuildFarmJob`."""
-        raise NotImplementedError
+        return 'buildlog.txt'
 
     def getName(self):
         """See `IBuildFarmJob`."""

=== added file 'lib/lp/buildmaster/model/packagebuildfarmjob.py'
--- lib/lp/buildmaster/model/packagebuildfarmjob.py	1970-01-01 00:00:00 +0000
+++ lib/lp/buildmaster/model/packagebuildfarmjob.py	2010-01-21 02:16:16 +0000
@@ -0,0 +1,30 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+__metaclass__ = type
+__all__ = ['PackageBuildFarmJob']
+
+
+from canonical.database.constants import UTC_NOW
+
+from lp.buildmaster.model.buildfarmjob import BuildFarmJob
+from lp.soyuz.interfaces.build import BuildStatus
+
+
+class PackageBuildFarmJob(BuildFarmJob):
+    """Mix-in class for `IBuildFarmJob` implementations for package builds."""
+
+    def jobStarted(self):
+        """See `IBuildFarmJob`."""
+        self.build.buildstate = BuildStatus.BUILDING
+        # The build started, set the start time if not set already.
+        if self.build.date_first_dispatched is None:
+            self.build.date_first_dispatched = UTC_NOW
+
+    def jobReset(self):
+        """See `IBuildFarmJob`."""
+        self.build.buildstate = BuildStatus.NEEDSBUILD
+
+    def jobAborted(self):
+        """See `IBuildFarmJob`."""
+        self.build.buildstate = BuildStatus.BUILDING

=== modified file 'lib/lp/soyuz/model/buildpackagejob.py'
--- lib/lp/soyuz/model/buildpackagejob.py	2010-01-18 22:01:19 +0000
+++ lib/lp/soyuz/model/buildpackagejob.py	2010-01-21 02:16:16 +0000
@@ -15,12 +15,11 @@
 from zope.interface import classProvides, implements
 from zope.component import getUtility
 
-from canonical.database.constants import UTC_NOW
 from canonical.database.sqlbase import sqlvalues
 
 from lp.buildmaster.interfaces.buildfarmjob import (
     BuildFarmJobType, IBuildFarmJobDispatchEstimation)
-from lp.buildmaster.model.buildfarmjob import BuildFarmJob
+from lp.buildmaster.model.packagebuildfarmjob import PackageBuildFarmJob
 from lp.registry.interfaces.sourcepackage import SourcePackageUrgency
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.services.job.interfaces.job import JobStatus
@@ -30,7 +29,7 @@
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 
 
-class BuildPackageJob(Storm, BuildFarmJob):
+class BuildPackageJob(PackageBuildFarmJob, Storm):
     """See `IBuildPackageJob`."""
     implements(IBuildPackageJob)
     classProvides(IBuildFarmJobDispatchEstimation)
@@ -162,25 +161,6 @@
         """See `IBuildPackageJob`."""
         return self.build.title
 
-    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
-
     @staticmethod
     def composePendingJobsQuery(min_score, processor, virtualized):
         """See `IBuildFarmJob`."""

=== modified file 'lib/lp/soyuz/model/sourcepackagerecipebuild.py'
--- lib/lp/soyuz/model/sourcepackagerecipebuild.py	2010-01-20 02:02:02 +0000
+++ lib/lp/soyuz/model/sourcepackagerecipebuild.py	2010-01-21 02:16:16 +0000
@@ -23,7 +23,7 @@
 
 from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
 from lp.buildmaster.model.buildbase import BuildBase
-from lp.buildmaster.model.buildfarmjob import BuildFarmJob
+from lp.buildmaster.model.packagebuildfarmjob import PackageBuildFarmJob
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.services.job.model.job import Job
 from lp.soyuz.adapters.archivedependencies import (
@@ -176,7 +176,7 @@
         return
 
 
-class SourcePackageRecipeBuildJob(BuildFarmJob, Storm):
+class SourcePackageRecipeBuildJob(PackageBuildFarmJob, Storm):
     classProvides(ISourcePackageRecipeBuildJobSource)
     implements(ISourcePackageRecipeBuildJob)