Merge lp:~cprov/launchpad/queue-builder-fixes into lp:launchpad

[Celso Providelo]

[Celso Providelo (cprov)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

= Summary =

This branch contains a fix for https://bugs.edge.launchpad.net/soyuz/+bug/418099.

It simply excludes source publications from COPY archives (test-rebuilds) from the build creation/verification loop.

Most of the test-rebuild are created for a restricted set of architectures and corresponding builds are created while initializing the archive, we should not re-process them otherwise unrequested builds will be created.

Moreover, test-rebuild archives are static, they don't receive new uploads neither respect the mutable architecture blacklist, so there is not need to re-process them.

In order to be eligible for cherrypicking, in this branch I'm only tweaking the source publication lookup query and adjusting the corresponding doctest to prove it works.

Later on, I will find time to rewrite the lookup query in storm-syntax and move it out from IDistroSeries, but that still pending a longer pre-impl call.

== Tests ==

./bin/test -vv -t buildd-queuebuilder-lookup.txt

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/registry/model/distroseries.py
  lib/lp/soyuz/doc/buildd-queuebuilder-lookup.txt
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkqS9j8ACgkQ7KBXuXyZSjC+2QCgg6GgDydNyef85CkJiCKm1gs0
qK8AniSGwLxkpxWi0On6gZ7VksEmhWQW
=fI56
-----END PGP SIGNATURE-----

[Graham Binns (gmb)]

review: Approve

=== modified file 'lib/lp/registry/model/distroseries.py'
--- lib/lp/registry/model/distroseries.py	2009-08-03 13:00:37 +0000
+++ lib/lp/registry/model/distroseries.py	2009-08-24 20:05:36 +0000
@@ -88,7 +88,7 @@
     StructuralSubscriptionTargetMixin)
 from canonical.launchpad.helpers import shortlist
 from lp.soyuz.interfaces.archive import (
-    ALLOW_RELEASE_BUILDS, IArchiveSet, MAIN_ARCHIVE_PURPOSES)
+    ALLOW_RELEASE_BUILDS, ArchivePurpose, IArchiveSet, MAIN_ARCHIVE_PURPOSES)
 from lp.soyuz.interfaces.build import IBuildSet
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.soyuz.interfaces.binarypackagename import (
@@ -850,19 +850,12 @@
 
     def getSourcesPublishedForAllArchives(self):
         """See `IDistroSeries`."""
-        # Both, PENDING and PUBLISHED sources will be considered for
-        # as PUBLISHED. It's part of the assumptions made in:
-        # https://launchpad.net/soyuz/+spec/build-unpublished-source
-        pend_build_statuses = (
-            PackagePublishingStatus.PENDING,
-            PackagePublishingStatus.PUBLISHED,
-            )
-
         query = """
             SourcePackagePublishingHistory.distroseries = %s AND
             SourcePackagePublishingHistory.archive = Archive.id AND
-            SourcePackagePublishingHistory.status in %s
-         """ % sqlvalues(self, pend_build_statuses)
+            SourcePackagePublishingHistory.status in %s AND
+            Archive.purpose != %s
+         """ % sqlvalues(self, active_publishing_status, ArchivePurpose.COPY)
 
         if not self.isUnstable():
             # Stable distroseries don't allow builds for the release

=== modified file 'lib/lp/soyuz/doc/buildd-queuebuilder-lookup.txt'
--- lib/lp/soyuz/doc/buildd-queuebuilder-lookup.txt	2009-07-16 03:31:45 +0000
+++ lib/lp/soyuz/doc/buildd-queuebuilder-lookup.txt	2009-08-24 20:05:36 +0000
@@ -31,6 +31,11 @@
     >>> partner_archive = getUtility(IArchiveSet).getByDistroPurpose(
     ...     distribution=ubuntu, purpose=ArchivePurpose.PARTNER)
 
+    >>> login('[e-mail]')
+    >>> copy_archive = factory.makeArchive(
+    ...     ubuntu, cprov, 'test-rebuild', ArchivePurpose.COPY)
+    >>> login(ANONYMOUS)
+
     >>> dspr = ubuntu.getSourcePackage('mozilla-firefox').getVersion('0.9')
     >>> the_spr = dspr.sourcepackagerelease
 
@@ -54,6 +59,7 @@
  * 1 PUBLISHED and 1 PENDING records in UPDATES pocket, main_archive;
  * 1 PUBLISHED and 1 PENDING records in RELEASE pocket, PPA archive;
  * 1 PUBLISHED and 1 PENDING records in RELEASE pocket, PARTNER archive;
+ * 1 PUBLISHED and 1 PENDING records in RELEASE pocket, COPY archive;
 
     >>> def create_sample_publications(distroseries):
     ...      create_publication(
@@ -80,6 +86,12 @@
     ...      create_publication(
     ...           distroseries, PackagePublishingPocket.RELEASE,
     ...           partner_archive, PackagePublishingStatus.PENDING)
+    ...      create_publication(
+    ...           distroseries, PackagePublishingPocket.RELEASE,
+    ...           copy_archive, PackagePublishingStatus.PUBLISHED)
+    ...      create_publication(
+    ...           distroseries, PackagePublishingPocket.RELEASE,
+    ...           copy_archive, PackagePublishingStatus.PENDING)
 
 This function will store previous publishing records that will be
 ignored later when inspecting the example results (sampledata already