Merge lp:~rockstar/launchpad/no-arm-recipe-build into lp:launchpad

[Paul Hummer]

There's a new ARM builder! Yay! At UDS though, we realized that we didn't
have constraints to make sure that SourcePackageRecipeBuilds didn't try to use
that ARM builder. Bad things happen when it does try to use the ARM builder.
There's a deeper problem that Soyuz has to figure out, but this branch fixes
the current problem. Translations has already landed a fix to production with
a similar fix.

I also removed some lint I noticed...

[Edwin Grubbs (edwin-grubbs)]

Go for it.

review: Approve

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-05-07 20:12:07 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-05-17 19:05:47 +0000
@@ -23,6 +23,7 @@
     SourcePackageRecipeView, SourcePackageRecipeBuildView
 )
 from lp.code.interfaces.sourcepackagerecipe import MINIMAL_RECIPE_TEXT
+from lp.soyuz.model.processor import ProcessorFamily
 from lp.testing import ANONYMOUS, BrowserTestCase, login
 
 
@@ -40,6 +41,9 @@
         self.squirrel = self.factory.makeDistroSeries(
             displayname='Secret Squirrel', name='secret',
             distribution=self.ppa.distribution)
+        self.squirrel.nominatedarchindep = self.squirrel.newArch(
+            'i386', ProcessorFamily.get(1), False, self.chef,
+            supports_virtualized=True)
 
     def makeRecipe(self):
         """Create and return a specific recipe."""
@@ -310,6 +314,10 @@
         woody = self.factory.makeDistroSeries(
             name='woody', displayname='Woody',
             distribution=self.ppa.distribution)
+        woody.nominatedarchindep = woody.newArch(
+            'i386', ProcessorFamily.get(1), False, self.factory.makePerson(),
+            supports_virtualized=True)
+
         recipe = self.makeRecipe()
         browser = self.getViewBrowser(recipe, '+request-builds')
         browser.getControl('Woody').click()

=== modified file 'lib/lp/code/interfaces/sourcepackagerecipe.py'
--- lib/lp/code/interfaces/sourcepackagerecipe.py	2010-04-30 12:33:16 +0000
+++ lib/lp/code/interfaces/sourcepackagerecipe.py	2010-05-17 19:05:47 +0000
@@ -36,12 +36,10 @@
 
 from lp.code.interfaces.branch import IBranch
 from lp.soyuz.interfaces.archive import IArchive
-from lp.registry.interfaces.person import IPerson
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.registry.interfaces.role import IHasOwner
 from lp.registry.interfaces.distroseries import IDistroSeries
 from lp.registry.interfaces.sourcepackagename import ISourcePackageName
-from lp.soyuz.interfaces.archive import IArchive
 
 
 MINIMAL_RECIPE_TEXT = dedent(u'''\

=== modified file 'lib/lp/code/model/sourcepackagerecipebuild.py'
--- lib/lp/code/model/sourcepackagerecipebuild.py	2010-05-05 20:01:56 +0000
+++ lib/lp/code/model/sourcepackagerecipebuild.py	2010-05-17 19:05:47 +0000
@@ -251,7 +251,10 @@
     build = Reference(
         build_id, 'SourcePackageRecipeBuild.id')
 
-    processor = None
+    @property
+    def processor(self):
+        return self.build.distroseries.nominatedarchindep.default_processor
+
     virtualized = True
 
     def __init__(self, build, job):

=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/model/tests/test_sourcepackagerecipe.py	2010-05-11 14:09:44 +0000
+++ lib/lp/code/model/tests/test_sourcepackagerecipe.py	2010-05-17 19:05:47 +0000
@@ -40,6 +40,7 @@
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.services.job.interfaces.job import (
     IJob, JobStatus)
+from lp.soyuz.model.processor import ProcessorFamily
 from lp.testing import (
     ANONYMOUS, launchpadlib_for, login, login_person, person_logged_in,
     TestCaseWithFactory, ws_object)
@@ -568,6 +569,11 @@
         person = self.factory.makePerson()
         archive = self.factory.makeArchive(owner=person)
         distroseries = self.factory.makeDistroSeries()
+        distroseries_i386 = distroseries.newArch(
+            'i386', ProcessorFamily.get(1), False, person,
+            supports_virtualized=True)
+        distroseries.nominatedarchindep = distroseries_i386
+
         recipe, user, launchpad = self.makeRecipe(person)
         distroseries = ws_object(launchpad, distroseries)
         archive = ws_object(launchpad, archive)

=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/code/model/tests/test_sourcepackagerecipebuild.py	2010-05-06 18:16:09 +0000
+++ lib/lp/code/model/tests/test_sourcepackagerecipebuild.py	2010-05-17 19:05:47 +0000
@@ -25,6 +25,7 @@
 from lp.code.interfaces.sourcepackagerecipebuild import (
     ISourcePackageRecipeBuildJob, ISourcePackageRecipeBuild,
     ISourcePackageRecipeBuildSource)
+from lp.soyuz.model.processor import ProcessorFamily
 from lp.testing import ANONYMOUS, login, person_logged_in, TestCaseWithFactory
 
 
@@ -35,11 +36,20 @@
 
     def makeSourcePackageRecipeBuild(self):
         """Create a `SourcePackageRecipeBuild` for testing."""
+        person = self.factory.makePerson()
+        distroseries = self.factory.makeDistroSeries()
+        distroseries_i386 = distroseries.newArch(
+            'i386', ProcessorFamily.get(1), False, person,
+            supports_virtualized=True)
+        distroseries.nominatedarchindep = distroseries_i386
+
         return getUtility(ISourcePackageRecipeBuildSource).new(
-            sourcepackage=self.factory.makeSourcePackage(),
-            recipe=self.factory.makeSourcePackageRecipe(),
+            sourcepackage=self.factory.makeSourcePackage(
+                distroseries=distroseries),
+            recipe=self.factory.makeSourcePackageRecipe(
+                distroseries=distroseries),
             archive=self.factory.makeArchive(),
-            requester=self.factory.makePerson())
+            requester=person)
 
     def test_providesInterfaces(self):
         # SourcePackageRecipeBuild provides IBuildBase and
@@ -62,11 +72,18 @@
 
     def test_queueBuild(self):
         spb = self.makeSourcePackageRecipeBuild()
+
         bq = spb.queueBuild()
         self.assertProvides(bq, IBuildQueue)
         self.assertProvides(bq.specific_job, ISourcePackageRecipeBuildJob)
         self.assertEqual(True, bq.virtualized)
-        self.assertIs(None, bq.processor)
+
+        # The processor for SourcePackageRecipeBuilds should not be None.  They
+        # do require specific environments.
+        self.assertNotEqual(None, bq.processor)
+        self.assertEqual(
+            spb.distroseries.nominatedarchindep.default_processor,
+            bq.processor)
         self.assertEqual(bq, spb.buildqueue_record)
 
     def test_title(self):

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-05-11 13:11:43 +0000
+++ lib/lp/testing/factory.py	2010-05-17 19:05:47 +0000
@@ -131,7 +131,7 @@
 from lp.soyuz.interfaces.processor import IProcessorFamilySet
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.soyuz.interfaces.section import ISectionSet
-from lp.soyuz.model.processor import ProcessorFamilySet
+from lp.soyuz.model.processor import ProcessorFamily, ProcessorFamilySet
 from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
 from lp.soyuz.model.publishing import SourcePackagePublishingHistory
 
@@ -1766,6 +1766,10 @@
             owner = self.makePerson()
         if distroseries is None:
             distroseries = self.makeDistroSeries()
+            distroseries.nominatedarchindep = distroseries.newArch(
+                'i386', ProcessorFamily.get(1), False, owner,
+                supports_virtualized=True)
+
         # Make sure we have a real sourcepackagename object.
         if (sourcepackagename is None or
             isinstance(sourcepackagename, basestring)):