Merge lp:~jelmer/launchpad/bug471148 into lp:launchpad/db-devel

[Jelmer Vernooij]

Add restricted flag to processor families and allow them to be overriden on a per-archive basis.

[Jelmer Vernooij (jelmer)]

This makes it possible for processor families to be marked restricted. Source packages in archives will only be built using these processor families if they are explicitly permitted, using an entry in ArchiveArch.

This patch also adds some infrastructure to create processor families and processors, which we use for testing.

I reran "make newsampledata" which doesn't appear to have happened in a while, so there are some updates there related to earlier branches as well.

[Jeroen T. Vermeulen (jtv)]

It looks as if this diff got polluted with extraneous changes.

[Jelmer Vernooij (jelmer)]

Hi Jeroen,

On Wed, 2010-02-24 at 18:18 +0000, Jeroen T. Vermeulen wrote:
> It looks as if this diff got polluted with extraneous changes.
The sampledata doesn't appear to have been regenerated a couple of times
after some other schema changes landed, and that causes the diff to
database/sampledata/current{,-devel}.sql to be so large - the only real
change I've made to the sample data is to add a ARM processor family
that has the new restricted column set to true. Other than that, this is
a fairly simple branch against db-devel.

If you'd rather have me submit a separate branch that just runs "make
newsampledata" in db-devel so that the diff for this branch isn't
cluttered by it, please let me know.

Cheers,

Jelmer

[Jelmer Vernooij (jelmer)]

Muharem has now submitted a separate branch which just updates the existing sampledata, that should make the diff for this branch a fair bit smaller.

[Muharem Hrnjadovic (al-maisan)]

Yep, it's lp:~al-maisan/launchpad/sampledata-update and it was just approved.

[Paul Hummer (rockstar)]

<rockstar> jelmer, is this diff up to date? Does it have a dependent branch?
<jelmer> rockstar: the bug471148 one? That's current now
<rockstar> jelmer, okay.
<jelmer> rockstar: It's a fair bit smaller now that Muharems prerequisite branch has landed.
<rockstar> jelmer, you should set the prerequisite branch on the mp anyway, because it's informational.
<jelmer> rockstar: Even if that branch has already landed?
<rockstar> jelmer, yeah, it's still a good idea to say "I based my work off of this work."
<rockstar> Not a necessity, but for history's sake.
<jelmer> rockstar: Ah, that makes sense. I'll keep that in mind for next time.
<rockstar> jelmer, your tests need comments/documentation
<rockstar> lib/lp/soyuz/tests/test_processor.py and lib/lp/soyuz/tests/test_publishing.py
<rockstar> Actually, it looks like some of the tests have docstrings, so you'll probably just need to add the docstrings to the ones that lack them.
<jelmer> ok
<rockstar> jelmer, good on you for adding factory methods for your new work.
<jelmer> rockstar: Thanks
<rockstar> jelmer, other than the missing docstrings, this looks like very good work.

review: Approve (code)

[Stuart Bishop (stub)]

So if there are no ArchArchive entries, the archive is build with all the non-retricted architectures.

A less generic name might be nice, but I can't think of a better term right now.

Looks fine anyway. Patch number patch-2207-35-0.sql.

review: Approve (db)

[Björn Tillenius (bjornt)]

I also would like to see a better name, but can't think of any right now.

review: Approve (db)

=== modified file 'database/sampledata/current-dev.sql'
--- database/sampledata/current-dev.sql	2010-02-25 08:39:19 +0000
+++ database/sampledata/current-dev.sql	2010-02-26 23:30:37 +0000
@@ -8143,10 +8143,11 @@
 
 ALTER TABLE processorfamily DISABLE TRIGGER ALL;
 
-INSERT INTO processorfamily (id, name, title, description) VALUES (1, 'x86', 'Intel 386 compatible chips', 'Bring back the 8086!');
-INSERT INTO processorfamily (id, name, title, description) VALUES (2, 'powerpc', 'PowerPC compatible systems, G3 G4 etc', 'An architecture conceived by Motorola and developed further in cooperation with IBM. Was used very successfully by Apple for their PowerMac range, until 2007.');
-INSERT INTO processorfamily (id, name, title, description) VALUES (3, 'amd64', 'AMD64 and Intel EM64T and compatible systems', 'A 64-bit extension to the venerable x86 architecture, pioneered by AMD and later adopted by Intel as well.');
-INSERT INTO processorfamily (id, name, title, description) VALUES (4, 'hppa', 'PA-RISC Processors', 'The HP PA-RISC and compatible processors');
+INSERT INTO processorfamily (id, name, title, description, restricted) VALUES (1, 'x86', 'Intel 386 compatible chips', 'Bring back the 8086!', false);
+INSERT INTO processorfamily (id, name, title, description, restricted) VALUES (2, 'powerpc', 'PowerPC compatible systems, G3 G4 etc', 'An architecture conceived by Motorola and developed further in cooperation with IBM. Was used very successfully by Apple for their PowerMac range, until 2007.', false);
+INSERT INTO processorfamily (id, name, title, description, restricted) VALUES (3, 'amd64', 'AMD64 and Intel EM64T and compatible systems', 'A 64-bit extension to the venerable x86 architecture, pioneered by AMD and later adopted by Intel as well.', false);
+INSERT INTO processorfamily (id, name, title, description, restricted) VALUES (4, 'hppa', 'PA-RISC Processors', 'The HP PA-RISC and compatible processors', false);
+INSERT INTO processorfamily (id, name, title, description, restricted) VALUES (5, 'arm', 'ARM Processors', 'The ARM and compatible processors', true);
 
 
 ALTER TABLE processorfamily ENABLE TRIGGER ALL;

=== modified file 'database/sampledata/current.sql'
--- database/sampledata/current.sql	2010-02-25 08:39:19 +0000
+++ database/sampledata/current.sql	2010-02-26 23:30:37 +0000
@@ -8039,10 +8039,11 @@
 
 ALTER TABLE processorfamily DISABLE TRIGGER ALL;
 
-INSERT INTO processorfamily (id, name, title, description) VALUES (1, 'x86', 'Intel 386 compatible chips', 'Bring back the 8086!');
-INSERT INTO processorfamily (id, name, title, description) VALUES (2, 'powerpc', 'PowerPC compatible systems, G3 G4 etc', 'An architecture conceived by Motorola and developed further in cooperation with IBM. Was used very successfully by Apple for their PowerMac range, until 2007.');
-INSERT INTO processorfamily (id, name, title, description) VALUES (3, 'amd64', 'AMD64 and Intel EM64T and compatible systems', 'A 64-bit extension to the venerable x86 architecture, pioneered by AMD and later adopted by Intel as well.');
-INSERT INTO processorfamily (id, name, title, description) VALUES (4, 'hppa', 'PA-RISC Processors', 'The HP PA-RISC and compatible processors');
+INSERT INTO processorfamily (id, name, title, description, restricted) VALUES (1, 'x86', 'Intel 386 compatible chips', 'Bring back the 8086!', false);
+INSERT INTO processorfamily (id, name, title, description, restricted) VALUES (2, 'powerpc', 'PowerPC compatible systems, G3 G4 etc', 'An architecture conceived by Motorola and developed further in cooperation with IBM. Was used very successfully by Apple for their PowerMac range, until 2007.', false);
+INSERT INTO processorfamily (id, name, title, description, restricted) VALUES (3, 'amd64', 'AMD64 and Intel EM64T and compatible systems', 'A 64-bit extension to the venerable x86 architecture, pioneered by AMD and later adopted by Intel as well.', false);
+INSERT INTO processorfamily (id, name, title, description, restricted) VALUES (4, 'hppa', 'PA-RISC Processors', 'The HP PA-RISC and compatible processors', false);
+INSERT INTO processorfamily (id, name, title, description, restricted) VALUES (5, 'arm', 'ARM Processors', 'The ARM and compatible processors', true);
 
 
 ALTER TABLE processorfamily ENABLE TRIGGER ALL;

=== added file 'database/schema/patch-2207-35-0.sql'
--- database/schema/patch-2207-35-0.sql	1970-01-01 00:00:00 +0000
+++ database/schema/patch-2207-35-0.sql	2010-02-26 23:30:37 +0000
@@ -0,0 +1,8 @@
+-- Copyright 2010 Canonical Ltd.  This software is licensed under the
+-- GNU Affero General Public License version 3 (see the file LICENSE).
+
+SET client_min_messages=ERROR;
+
+ALTER TABLE processorfamily ADD COLUMN restricted boolean DEFAULT FALSE NOT NULL;
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2207, 35, 0);

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2010-02-22 12:44:29 +0000
+++ database/schema/security.cfg	2010-02-26 23:30:37 +0000
@@ -125,7 +125,7 @@
 public.archive                          = SELECT, INSERT, UPDATE
 public.archiveauthtoken                 = SELECT, INSERT, UPDATE
 public.archivesubscriber                = SELECT, INSERT, UPDATE
-public.archivearch                      = SELECT, INSERT, UPDATE
+public.archivearch                      = SELECT, INSERT, UPDATE, DELETE
 public.archivedependency                = SELECT, INSERT, DELETE
 public.archivepermission                = SELECT, INSERT, UPDATE, DELETE
 public.authtoken                        = SELECT, INSERT, UPDATE, DELETE
@@ -916,7 +916,7 @@
 # certain processes, such as the librarian tables. This group is deprecated -
 # access should be explicitly granted to users.
 public.archive                          = SELECT, INSERT, UPDATE
-public.archivearch                      = SELECT, INSERT, UPDATE
+public.archivearch                      = SELECT, INSERT, UPDATE, DELETE
 public.binarypackagerelease             = SELECT, INSERT, UPDATE
 public.binarypackagefile                = SELECT, INSERT, UPDATE
 public.binarypackagefilepublishing      = SELECT, INSERT, UPDATE

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2010-02-25 16:49:16 +0000
+++ lib/lp/soyuz/browser/archive.py	2010-02-26 23:30:37 +0000
@@ -1790,7 +1790,7 @@
 
     field_names = ['enabled', 'private', 'require_virtualized',
                    'buildd_secret', 'authorized_size', 'relative_build_score',
-                   'external_dependencies']
+                   'external_dependencies', 'arm_builds_allowed']
 
     custom_widget('external_dependencies', TextAreaWidget, height=3)
 

=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml	2010-02-25 22:41:23 +0000
+++ lib/lp/soyuz/configure.zcml	2010-02-26 23:30:37 +0000
@@ -400,7 +400,8 @@
         <require
             permission="launchpad.Edit"
             interface="lp.soyuz.interfaces.archive.IArchiveEdit"
-            set_attributes="description displayname publish"/>
+            set_attributes="description displayname arm_builds_allowed
+			                publish"/>
         <require
             permission="launchpad.Commercial"
             set_attributes="authorized_size buildd_secret

=== modified file 'lib/lp/soyuz/interfaces/archive.py'
--- lib/lp/soyuz/interfaces/archive.py	2010-02-25 16:49:16 +0000
+++ lib/lp/soyuz/interfaces/archive.py	2010-02-26 23:30:37 +0000
@@ -1090,6 +1090,9 @@
     def disable():
         """Disable the archive."""
 
+    arm_builds_allowed = Bool(
+        title=_("Allow ARM builds for this archive"))
+
 
 class IArchive(IArchivePublic, IArchiveAppend, IArchiveEdit, IArchiveView):
     """Main Archive interface."""

=== modified file 'lib/lp/soyuz/interfaces/archivearch.py'
--- lib/lp/soyuz/interfaces/archivearch.py	2009-06-25 04:06:00 +0000
+++ lib/lp/soyuz/interfaces/archivearch.py	2010-02-26 23:30:37 +0000
@@ -62,3 +62,14 @@
 
         :return: A (potentially empty) result set of `IArchiveArch` instances.
         """
+
+    def getRestrictedfamilies(archive):
+        """All restricted processor families, paired with `ArchiveArch`
+        instances if associated with `archive`.
+
+        :return: A sequence containing a (`ProcessorFamily`, `ArchiveArch`)
+            2-tuple for each processor family.
+            The second value in the tuple will be None if the given `archive`
+            is not associated with the `ProcessorFamily` yet.
+        """
+

=== modified file 'lib/lp/soyuz/interfaces/processor.py'
--- lib/lp/soyuz/interfaces/processor.py	2009-06-25 04:06:00 +0000
+++ lib/lp/soyuz/interfaces/processor.py	2010-02-26 23:30:37 +0000
@@ -13,7 +13,10 @@
     'IProcessorFamilySet',
     ]
 
+from canonical.launchpad import _
+
 from zope.interface import Interface, Attribute
+from zope.schema import Bool
 
 class IProcessor(Interface):
     """The SQLObject Processor Interface"""
@@ -29,11 +32,21 @@
     name = Attribute("The Processor Family Name")
     title = Attribute("The Processor Family Title")
     description = Attribute("The Processor Name Description")
-
     processors = Attribute("The Processors in this family.")
+    restricted = Bool(title=_("Whether this family is restricted."))
+
+    def addProcessor(name, title, description):
+        """Add a new processor to this family.
+
+        :param name: Name of the processor
+        :param title: Title of the processor
+        :param description: Description of the processor
+        :return: A `IProcessor`
+        """
 
 class IProcessorFamilySet(Interface):
     """Operations related to ProcessorFamily instances."""
+
     def getByName(name):
         """Return the ProcessorFamily instance with the matching name.
 
@@ -49,3 +62,13 @@
 
         :return: A `IProcessorFamily` instance if found, None otherwise.
         """
+
+    def new(name, title, description, restricted):
+        """Create a new processor family.
+
+        :param name: Name of the family.
+        :param title: Title for the family.
+        :param description: Extended description of the family
+        :param restricted: Whether the processor family is restricted
+        :return: a `IProcessorFamily`.
+        """

=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2010-02-18 17:05:50 +0000
+++ lib/lp/soyuz/model/archive.py	2010-02-26 23:30:37 +0000
@@ -59,6 +59,7 @@
     IDistributionArchive, InvalidComponent, IPPA, MAIN_ARCHIVE_PURPOSES,
     NoSuchPPA, PocketNotFound, VersionRequiresName, default_name_by_purpose)
 from lp.soyuz.interfaces.archiveauthtoken import IArchiveAuthTokenSet
+from lp.soyuz.interfaces.archivearch import IArchiveArchSet
 from lp.soyuz.interfaces.archivepermission import (
     ArchivePermissionType, IArchivePermissionSet)
 from lp.soyuz.interfaces.archivesubscriber import (
@@ -75,6 +76,7 @@
 from lp.registry.interfaces.role import IHasOwner
 from lp.soyuz.interfaces.queue import PackageUploadStatus
 from lp.soyuz.interfaces.packagecopyrequest import IPackageCopyRequestSet
+from lp.soyuz.interfaces.processor import IProcessorFamilySet
 from lp.soyuz.interfaces.publishing import (
     active_publishing_status, PackagePublishingStatus, IPublishingSet)
 from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
@@ -182,6 +184,39 @@
     external_dependencies = StringCol(
         dbName='external_dependencies', notNull=False, default=None)
 
+    def _get_arm_builds_enabled(self):
+        """Check whether ARM builds are allowed for this archive."""
+        archive_arch_set = getUtility(IArchiveArchSet)
+        restricted_families = archive_arch_set.getRestrictedfamilies(self)
+        arm = getUtility(IProcessorFamilySet).getByName('arm')
+        for (family, archive_arch) in restricted_families:
+            if family == arm:
+                return (archive_arch is not None)
+        # ARM doesn't exist or isn't restricted. Either way, there is no 
+        # need for an explicit association.
+        return False
+
+    def _set_arm_builds_enabled(self, value):
+        """Set whether ARM builds are enabled for this archive."""
+        archive_arch_set = getUtility(IArchiveArchSet)
+        restricted_families = archive_arch_set.getRestrictedfamilies(self)
+        arm = getUtility(IProcessorFamilySet).getByName('arm')
+        for (family, archive_arch) in restricted_families:
+            if family == arm:
+                if value:
+                    if archive_arch is not None:
+                        # ARM builds are already enabled
+                        return
+                    else:
+                        archive_arch_set.new(self, family)
+                else:
+                    if archive_arch is not None:
+                        Store.of(self).remove(archive_arch)
+                    else:
+                        pass # ARM builds are already disabled
+    arm_builds_allowed = property(_get_arm_builds_enabled,
+        _set_arm_builds_enabled)
+
     def _init(self, *args, **kw):
         """Provide the right interface for URL traversal."""
         SQLBase._init(self, *args, **kw)

=== modified file 'lib/lp/soyuz/model/archivearch.py'
--- lib/lp/soyuz/model/archivearch.py	2009-06-25 04:06:00 +0000
+++ lib/lp/soyuz/model/archivearch.py	2010-02-26 23:30:37 +0000
@@ -9,9 +9,11 @@
 
 from lp.soyuz.interfaces.archivearch import (
     IArchiveArch, IArchiveArchSet)
+from lp.soyuz.model.processor import ProcessorFamily
 from canonical.launchpad.webapp.interfaces import (
     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
 
+from storm.expr import Join, LeftJoin
 from storm.locals import Int, Reference, Storm
 
 
@@ -55,3 +57,17 @@
         results = results.order_by(ArchiveArch.id)
 
         return results
+
+    def getRestrictedfamilies(self, archive):
+        """See `IArchiveArchSet`."""
+        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
+        origin = (
+            ProcessorFamily,
+            LeftJoin(
+                ArchiveArch,
+                ArchiveArch.processorfamily == ProcessorFamily.id))
+        result_set = store.using(*origin).find(
+            (ProcessorFamily, ArchiveArch),
+            (ProcessorFamily.restricted == True))
+
+        return result_set.order_by(ProcessorFamily.name)

=== modified file 'lib/lp/soyuz/model/processor.py'
--- lib/lp/soyuz/model/processor.py	2009-06-25 04:06:00 +0000
+++ lib/lp/soyuz/model/processor.py	2010-02-26 23:30:37 +0000
@@ -10,6 +10,7 @@
 from zope.interface import implements
 
 from sqlobject import StringCol, ForeignKey, SQLMultipleJoin
+from storm.locals import Bool
 
 from canonical.database.sqlbase import SQLBase
 
@@ -39,6 +40,12 @@
     description = StringCol(dbName='description', notNull=True)
 
     processors = SQLMultipleJoin('Processor', joinColumn='family')
+    restricted = Bool(allow_none=False, default=False)
+
+    def addProcessor(self, name, title, description):
+        """See `IProcessorFamily`."""
+        return Processor(family=self, name=name, title=title,
+            description=description)
 
 
 class ProcessorFamilySet:
@@ -62,3 +69,8 @@
         # but there is also the possibility that the user specified a name for
         # a non-existent processor.
         return rset.one()
+
+    def new(self, name, title, description, restricted=False):
+        """See `IProcessorFamily`."""
+        return ProcessorFamily(name=name, title=title,
+            description=description, restricted=restricted)

=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py	2010-02-15 12:59:55 +0000
+++ lib/lp/soyuz/model/publishing.py	2010-02-26 23:30:37 +0000
@@ -45,14 +45,15 @@
     LibraryFileAlias, LibraryFileContent)
 from lp.soyuz.model.packagediff import PackageDiff
 from lp.soyuz.interfaces.archive import ArchivePurpose
+from lp.soyuz.interfaces.archivearch import IArchiveArchSet
 from lp.soyuz.interfaces.component import IComponentSet
 from lp.soyuz.interfaces.queue import PackageUploadStatus
 from lp.soyuz.interfaces.publishing import (
-    active_publishing_status, IArchiveSafePublisher,
-    IBinaryPackageFilePublishing, IBinaryPackagePublishingHistory,
-    IPublishingEdit, IPublishingSet, ISourcePackageFilePublishing,
-    ISourcePackagePublishingHistory, PackagePublishingPriority,
-    PackagePublishingStatus, PoolFileOverwriteError)
+    active_publishing_status, IBinaryPackageFilePublishing,
+    IBinaryPackagePublishingHistory, IPublishingSet,
+    ISourcePackageFilePublishing, ISourcePackagePublishingHistory,
+    PackagePublishingPriority, PackagePublishingStatus,
+    PoolFileOverwriteError)
 from lp.soyuz.interfaces.build import BuildSetStatus, BuildStatus, IBuildSet
 from lp.soyuz.scripts.changeoverride import ArchiveOverriderError
 from canonical.launchpad.components.decoratedresultset import (
@@ -505,6 +506,22 @@
         the_url = self._proxied_urls((changes_lfa,), self.archive)[0]
         return the_url
 
+    def _getAllowedArchitectures(self, available_archs):
+        """Filter out any restricted architectures not specifically allowed 
+        for an archive.
+
+        :param available_archs: Architectures to consider
+        :return: Sequence of `IDistroArch` instances.
+        """
+        associated_proc_families = [
+            archivearch.processorfamily for archivearch 
+            in getUtility(IArchiveArchSet).getByArchive(self.archive)]
+        # Return all distroarches with unrestricted processor families or with
+        # processor families the archive is explicitly associated with.
+        return [distroarch for distroarch in available_archs
+            if not distroarch.processorfamily.restricted or 
+               distroarch.processorfamily in associated_proc_families]
+
     def createMissingBuilds(self, architectures_available=None,
                             pas_verify=None, logger=None):
         """See `ISourcePackagePublishingHistory`."""
@@ -515,6 +532,9 @@
             architectures_available = list(
                 self.distroseries.enabled_architectures)
 
+        architectures_available = self._getAllowedArchitectures(
+            architectures_available)
+
         build_architectures = determineArchitecturesToBuild(
             self, architectures_available, self.distroseries, pas_verify)
 

=== modified file 'lib/lp/soyuz/tests/test_archive.py'
--- lib/lp/soyuz/tests/test_archive.py	2010-02-08 16:33:12 +0000
+++ lib/lp/soyuz/tests/test_archive.py	2010-02-26 23:30:37 +0000
@@ -19,8 +19,10 @@
 from lp.registry.interfaces.person import IPersonSet
 from lp.services.job.interfaces.job import JobStatus
 from lp.soyuz.interfaces.archive import IArchiveSet, ArchivePurpose
+from lp.soyuz.interfaces.archivearch import IArchiveArchSet
 from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFormat
 from lp.soyuz.interfaces.build import BuildStatus
+from lp.soyuz.interfaces.processor import IProcessorFamilySet
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.soyuz.model.build import Build
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
@@ -558,5 +560,56 @@
         self.assertEqual(1, len(pubs))
         self.assertEqual('0.5.11~ppa1', pubs[0].source_package_version)
 
+
+class TestARMBuildsAllowed(TestCaseWithFactory):
+    """Ensure that ARM builds can be allowed and disallowed correctly."""
+
+    layer = LaunchpadZopelessLayer
+
+    def setUp(self):
+        """Setup an archive with relevant publications."""
+        super(TestARMBuildsAllowed, self).setUp()
+        self.publisher = SoyuzTestPublisher()
+        self.publisher.prepareBreezyAutotest()
+        self.archive = self.factory.makeArchive()
+        self.archive_arch_set = getUtility(IArchiveArchSet)
+        self.arm = getUtility(IProcessorFamilySet).getByName('arm')
+
+    def test_default(self):
+        """By default, ARM builds are not allowed."""
+        self.assertEquals(0, 
+            self.archive_arch_set.getByArchive(self.archive, self.arm).count())
+        self.assertFalse(self.archive.arm_builds_allowed)
+
+    def test_get_uses_archivearch(self):
+        """Adding an entry to ArchiveArch for ARM and an archive will 
+        enable arm_builds_allowed for that archive."""
+        self.assertFalse(self.archive.arm_builds_allowed)
+        self.archive_arch_set.new(self.archive, self.arm)
+        self.assertTrue(self.archive.arm_builds_allowed)
+
+    def test_get_uses_arm_only(self):
+        """Adding an entry to ArchiveArch for something other than ARM 
+        does not enable arm_builds_allowed for that archive."""
+        self.assertFalse(self.archive.arm_builds_allowed)
+        self.archive_arch_set.new(self.archive, 
+            getUtility(IProcessorFamilySet).getByName('amd64'))
+        self.assertFalse(self.archive.arm_builds_allowed)
+
+    def test_set(self):
+        """The property remembers its value correctly and sets ArchiveArch."""
+        self.archive.arm_builds_allowed = True
+        allowed_restricted_families = self.archive_arch_set.getByArchive(
+            self.archive, self.arm)
+        self.assertEquals(1, allowed_restricted_families.count())
+        self.assertEquals(self.arm,
+            allowed_restricted_families[0].processorfamily)
+        self.assertTrue(self.archive.arm_builds_allowed)
+        self.archive.arm_builds_allowed = False
+        self.assertEquals(0, 
+            self.archive_arch_set.getByArchive(self.archive, self.arm).count())
+        self.assertFalse(self.archive.arm_builds_allowed)
+
+
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== added file 'lib/lp/soyuz/tests/test_archivearch.py'
--- lib/lp/soyuz/tests/test_archivearch.py	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/tests/test_archivearch.py	2010-02-26 23:30:37 +0000
@@ -0,0 +1,57 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Test ArchiveArch features."""
+
+import unittest
+
+from zope.component import getUtility
+
+from canonical.testing import LaunchpadZopelessLayer
+
+from lp.testing import TestCaseWithFactory
+
+from lp.registry.interfaces.person import IPersonSet
+from lp.soyuz.interfaces.archivearch import IArchiveArchSet
+from lp.soyuz.interfaces.processor import IProcessorFamilySet
+
+class TestArchiveArch(TestCaseWithFactory):
+
+    layer = LaunchpadZopelessLayer
+
+    def setUp(self):
+        """Use `SoyuzTestPublisher` to publish some sources in archives."""
+        super(TestArchiveArch, self).setUp()
+
+        self.ppa = getUtility(IPersonSet).getByName('cprov').archive
+        pss = getUtility(IProcessorFamilySet)
+        self.cell_proc = pss.new(
+            'cell-proc', 'PS cell processor', 'Screamingly faaaaaaaaaaaast',
+            True)
+        self.omap = pss.new(
+            'omap', 'Multimedia applications processor',
+            'Does all your sound & video', True)
+
+    def test_no_associations(self):
+        """Our archive is not associated with any restricted processor
+        families yet."""
+        result_set = list(
+            getUtility(IArchiveArchSet).getRestrictedfamilies(self.ppa))
+        archivearches = [row[1] for row in result_set]
+        self.assertTrue(all(aa is None for aa in archivearches))
+
+    def test_single_association(self):
+        """Our archive is now associated with one of the restricted processor
+        families."""
+        getUtility(IArchiveArchSet).new(self.ppa, self.cell_proc)
+        result_set = list(
+            getUtility(IArchiveArchSet).getRestrictedfamilies(self.ppa))
+        results = dict(
+            (row[0].name, row[1] is not None) for row in result_set)
+        self.assertEquals(
+            { 'arm' : False, 'cell-proc' : True, 'omap' : False},
+            results)
+
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)

=== added file 'lib/lp/soyuz/tests/test_processor.py'
--- lib/lp/soyuz/tests/test_processor.py	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/tests/test_processor.py	2010-02-26 23:30:37 +0000
@@ -0,0 +1,32 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Test Processor and ProcessorFamily features."""
+
+from zope.component import getUtility
+
+from canonical.testing import LaunchpadZopelessLayer
+
+from lp.soyuz.interfaces.processor import (IProcessor, IProcessorFamily,
+    IProcessorFamilySet)
+from lp.testing import TestCaseWithFactory
+
+
+class ProcessorFamilyTests(TestCaseWithFactory):
+    """Test ProcessorFamily."""
+
+    layer = LaunchpadZopelessLayer
+
+    def test_create(self):
+        """Test adding a new ProcessorFamily."""
+        family = getUtility(IProcessorFamilySet).new("avr", "Atmel AVR",
+            "The Modified Harvard architecture 8-bit RISC processors.")
+        self.assertProvides(family, IProcessorFamily)
+
+    def test_add_processor(self):
+        """Test adding a new Processor to a ProcessorFamily."""
+        family = getUtility(IProcessorFamilySet).new("avr", "Atmel AVR",
+            "The Modified Harvard architecture 8-bit RISC processors.")
+        proc = family.addProcessor("avr2001", "The 2001 AVR", "Fast as light.")
+        self.assertProvides(proc, IProcessor)
+        self.assertEquals(family, proc.family)

=== modified file 'lib/lp/soyuz/tests/test_publishing.py'
--- lib/lp/soyuz/tests/test_publishing.py	2010-02-24 10:18:16 +0000
+++ lib/lp/soyuz/tests/test_publishing.py	2010-02-26 23:30:37 +0000
@@ -31,6 +31,7 @@
 from lp.registry.interfaces.sourcepackage import SourcePackageUrgency
 from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
 from lp.soyuz.interfaces.archive import ArchivePurpose
+from lp.soyuz.interfaces.archivearch import IArchiveArchSet
 from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
 from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFormat
 from lp.soyuz.interfaces.build import BuildStatus
@@ -861,6 +862,104 @@
             binary, binary.distroarchseries.distroseries, 'universe')
 
 
+class BuildRecordCreationTests(TestNativePublishingBase):
+    """Test the creation of build records."""
+
+    def setUp(self):
+        super(BuildRecordCreationTests, self).setUp()
+        self.distro = self.factory.makeDistribution()
+        self.distroseries = self.factory.makeDistroSeries(
+            distribution=self.distro, name="crazy")
+        self.archive = self.factory.makeArchive()
+        self.avr_family = self.factory.makeProcessorFamily(
+            name="avr", restricted=True)
+        self.factory.makeProcessor(self.avr_family, "avr2001")
+        self.avr_distroarch = self.factory.makeDistroArchSeries(
+            architecturetag='avr', processorfamily=self.avr_family,
+            distroseries=self.distroseries, supports_virtualized=True)
+        self.sparc_family = self.factory.makeProcessorFamily(name="sparc",
+            restricted=False)
+        self.factory.makeProcessor(self.sparc_family, "sparc64")
+        self.sparc_distroarch = self.factory.makeDistroArchSeries(
+            architecturetag='sparc', processorfamily=self.sparc_family,
+            distroseries=self.distroseries, supports_virtualized=True)
+        self.distroseries.nominatedarchindep = self.sparc_distroarch
+        self.addFakeChroots(self.distroseries)
+
+    def getPubSource(self, architecturehintlist):
+        """Return a mock source package publishing record for the archive 
+        and architecture used in this testcase.
+
+        :param architecturehintlist: Architecture hint list (e.g. "i386 amd64")
+        """
+        return super(BuildRecordCreationTests, self).getPubSource(
+            archive=self.archive, distroseries=self.distroseries,
+            architecturehintlist=architecturehintlist)
+
+    def test__getAllowedArchitectures_restricted(self):
+        """Test _getAllowedArchitectures doesn't return unrestricted
+        archs.
+
+        For a normal archive, only unrestricted architectures should
+        be used.
+        """
+        available_archs = [self.sparc_distroarch, self.avr_distroarch]
+        pubrec = self.getPubSource(architecturehintlist='any')
+        self.assertEquals([self.sparc_distroarch],
+            pubrec._getAllowedArchitectures(available_archs))
+
+    def test__getAllowedArchitectures_restricted_override(self):
+        """Test _getAllowedArchitectures honors overrides of restricted archs.
+
+        Restricted architectures should only be allowed if there is 
+        an explicit ArchiveArch association with the archive.
+        """
+        available_archs = [self.sparc_distroarch, self.avr_distroarch]
+        getUtility(IArchiveArchSet).new(self.archive, self.avr_family)
+        pubrec = self.getPubSource(architecturehintlist='any')
+        self.assertEquals([self.sparc_distroarch, self.avr_distroarch], 
+            pubrec._getAllowedArchitectures(available_archs))
+
+    def test_createMissingBuilds_restricts_any(self):
+        """createMissingBuilds() should limit builds targeted at 'any'
+        architecture to those allowed for the archive.
+        """
+        pubrec = self.getPubSource(architecturehintlist='any')
+        builds = pubrec.createMissingBuilds()
+        self.assertEquals(1, len(builds))
+        self.assertEquals(self.sparc_distroarch, builds[0].distroarchseries)
+
+    def test_createMissingBuilds_restricts_explicitlist(self):
+        """createMissingBuilds() should limit builds targeted at a 
+        variety of architectures architecture to those allowed for the archive.
+        """
+        pubrec = self.getPubSource(architecturehintlist='sparc i386 avr')
+        builds = pubrec.createMissingBuilds()
+        self.assertEquals(1, len(builds))
+        self.assertEquals(self.sparc_distroarch, builds[0].distroarchseries)
+
+    def test_createMissingBuilds_restricts_all(self):
+        """createMissingBuilds() should limit builds targeted at 'all'
+        architectures to the nominated independent architecture, 
+        if that is allowed for the archive.
+        """
+        pubrec = self.getPubSource(architecturehintlist='all')
+        builds = pubrec.createMissingBuilds()
+        self.assertEquals(1, len(builds))
+        self.assertEquals(self.sparc_distroarch, builds[0].distroarchseries)
+
+    def test_createMissingBuilds_restrict_override(self):
+        """createMissingBuilds() should limit builds targeted at 'any'
+        architecture to architectures that are unrestricted or 
+        explicitly associated with the archive.
+        """
+        getUtility(IArchiveArchSet).new(self.archive, self.avr_family)
+        pubrec = self.getPubSource(architecturehintlist='any')
+        builds = pubrec.createMissingBuilds()
+        self.assertEquals(2, len(builds))
+        self.assertEquals(self.avr_distroarch, builds[0].distroarchseries)
+        self.assertEquals(self.sparc_distroarch, builds[1].distroarchseries)
+
 
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-02-25 07:42:32 +0000
+++ lib/lp/testing/factory.py	2010-02-26 23:30:37 +0000
@@ -126,6 +126,7 @@
 from lp.soyuz.adapters.packagelocation import PackageLocation
 from lp.soyuz.interfaces.component import IComponentSet
 from lp.soyuz.interfaces.packageset import IPackagesetSet
+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.buildqueue import BuildQueue
@@ -613,6 +614,38 @@
                          productseries=productseries,
                          name=name)
 
+    def makeProcessor(self, family, name, title=None, description=None):
+        """Create a new processor.
+
+        :param family: Family of the processor
+        :param name: Name of the processor
+        :param title: Optional title
+        :param description: Optional description
+        :return: A `IProcessor`
+        """
+        if title is None:
+            title = "The %s processor" % name
+        if description is None:
+            description = "The %s and processor and compatible processors"
+        return family.addProcessor(name, title, description)
+
+    def makeProcessorFamily(self, name, title=None, description=None,
+                            restricted=False):
+        """Create a new processor family.
+        
+        :param name: Name of the family (e.g. x86)
+        :param title: Optional title of the family
+        :param description: Optional extended description
+        :param restricted: Whether the processor family is restricted
+        :return: A `IProcessorFamily`
+        """
+        if description is None:
+            description = "Description of the %s processor family" % name
+        if title is None:
+            title = "%s and compatible processors." % name
+        return getUtility(IProcessorFamilySet).new(name, title, description,
+            restricted=restricted)
+
     def makeProductRelease(self, milestone=None, product=None,
                            productseries=None):
         if milestone is None: