Merge lp:~julian-edwards/launchpad/copy-archive-virtualization-bug-600640 into lp:launchpad

[Julian Edwards]

When creating copy archives, they currently default to virtualized so that
they use the PPA builders.

Unfortunately this has the side effect of restricting the available build
architectures to those available as PPA builders, which is quite limited. In
the most recent use case, we want to do an armel rebuild and this is
impossible.

I've made a simple change so that the virtualization state of the new copy
archive is settable on the command line via a new paramter "--nonvirtualized",
which if present will change from the default of virtual, to non-virtual.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'lib/lp/soyuz/scripts/populate_archive.py'
--- lib/lp/soyuz/scripts/populate_archive.py	2010-06-16 22:16:46 +0000
+++ lib/lp/soyuz/scripts/populate_archive.py	2010-07-01 16:05:51 +0000
@@ -53,7 +53,7 @@
         self, from_archive, from_distribution, from_suite, from_user,
         component, to_distribution, to_suite, to_archive, to_user, reason,
         include_binaries, arch_tags, merge_copy_flag,
-        packageset_delta_flag):
+        packageset_delta_flag, nonvirtualized):
         """Create archive, populate it with packages and builds.
 
         Please note: if a component was specified for the origin then the
@@ -206,10 +206,12 @@
             # before the switch is flipped and build activity starts.
             # Also, builds for copy archives should default to using
             # virtual builders.
+            virtual = not nonvirtualized
             copy_archive = getUtility(IArchiveSet).new(
                 ArchivePurpose.COPY, registrant, name=to_archive,
                 distribution=the_destination.distribution,
-                description=reason, enabled=False, require_virtualized=True)
+                description=reason, enabled=False,
+                require_virtualized=virtual)
             the_destination.archive = copy_archive
             # Associate the newly created copy archive with the processor
             # families specified by the user.
@@ -310,12 +312,14 @@
             raise SoyuzScriptError(
                 "Invalid origin archive name: '%s'" % opts.from_archive)
 
+        # For the love of $DEITY, WTF doesn't this method just accept a
+        # single parameter "opts" ...
         self.populateArchive(
             opts.from_archive, opts.from_distribution, opts.from_suite,
             opts.from_user, opts.component, opts.to_distribution,
             opts.to_suite, opts.to_archive, opts.to_user, opts.reason,
             opts.include_binaries, opts.arch_tags, opts.merge_copy_flag,
-            opts.packageset_delta_flag)
+            opts.packageset_delta_flag, opts.nonvirtualized)
 
     def add_my_options(self):
         """Parse command line arguments for copy archive creation/population.
@@ -379,6 +383,11 @@
                 'Only show packages that are fresher or new in origin '
                 'archive. Destination archive must exist already.'))
 
+        self.parser.add_option(
+            "--nonvirtualized", dest="nonvirtualized", default=False,
+            action="store_true",
+            help='Create the archive as nonvirtual if specified.')
+
     def _createMissingBuilds(
         self, distroseries, archive, proc_families):
         """Create builds for all cloned source packages.

=== modified file 'lib/lp/soyuz/scripts/tests/test_populatearchive.py'
--- lib/lp/soyuz/scripts/tests/test_populatearchive.py	2010-06-22 11:14:02 +0000
+++ lib/lp/soyuz/scripts/tests/test_populatearchive.py	2010-07-01 16:05:51 +0000
@@ -214,7 +214,7 @@
 
     def copyArchive(self, distroseries, archive_name, owner,
         architectures=None, component="main", from_user=None,
-        from_archive=None):
+        from_archive=None, nonvirtualized=False):
         """Run the copy-archive script."""
         extra_args = [
             '--from-distribution', distroseries.distribution.name,
@@ -237,6 +237,9 @@
         if architectures is None:
             architectures = ["386"]
 
+        if nonvirtualized:
+            extra_args.extend(["--nonvirtualized"])
+
         for architecture in architectures:
             extra_args.extend(['-a', architecture])
 
@@ -253,9 +256,9 @@
         # flag turned off.
         self.assertFalse(copy_archive.enabled)
 
-        # Also, make sure that the builds for the new copy archive will be
-        # carried out on non-virtual builders.
-        self.assertTrue(copy_archive.require_virtualized)
+        # Assert the virtualization is correct.
+        virtual = not nonvirtualized
+        self.assertEqual(copy_archive.require_virtualized, virtual)
 
         return copy_archive
 
@@ -282,13 +285,15 @@
         self.createSourcePublications(package_infos, distroseries)
         return distroseries
 
-    def makeCopyArchive(self, package_infos, component="main"):
+    def makeCopyArchive(self, package_infos, component="main",
+                        nonvirtualized=False):
         """Make a copy archive based on a new distribution."""
         owner = self.createTargetOwner()
         distroseries = self.createSourceDistribution(package_infos)
         archive_name = self.getTargetArchiveName(distroseries.distribution)
         copy_archive = self.copyArchive(
-            distroseries, archive_name, owner, component=component)
+            distroseries, archive_name, owner, component=component,
+            nonvirtualized=nonvirtualized)
         return (copy_archive, distroseries)
 
     def checkBuilds(self, archive, package_infos):