Merge lp:~cjwatson/launchpad/do-not-expire-phone-overlay into lp:launchpad

[Colin Watson]

Don't expire files from ppa:ci-train-ppa-service/ubuntu/stable-phone-overlay, because the Ubuntu phone product is currently released from it.

Don't expire files from ppa:ci-train-ppa-service/ubuntu/stable-phone-overlay, because the Ubuntu phone product is currently released from it.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/soyuz/scripts/expire_archive_files.py'
--- lib/lp/soyuz/scripts/expire_archive_files.py	2013-06-20 05:50:00 +0000
+++ lib/lp/soyuz/scripts/expire_archive_files.py	2015-06-08 19:17:23 +0000
@@ -9,10 +9,11 @@
 from lp.soyuz.enums import ArchivePurpose
 from lp.soyuz.model.archive import Archive
 
-# PPA owners that we never want to expire.
+# PPA owners or particular PPAs that we never want to expire.
 BLACKLISTED_PPAS = """
 adobe-isv
 chelsea-team
+ci-train-ppa-service/stable-phone-overlay
 dennis-team
 elvis-team
 fluendo-isv
@@ -79,9 +80,10 @@
                 AND spr.id = sprf.sourcepackagerelease
                 AND spph.sourcepackagerelease = spr.id
                 AND spph.dateremoved < (
-                    CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - interval %s)
+                    CURRENT_TIMESTAMP AT TIME ZONE 'UTC' -
+                    interval %(stay_of_execution)s)
                 AND spph.archive = archive.id
-                AND archive.purpose IN %s
+                AND archive.purpose IN %(archive_types)s
                 AND lfa.expires IS NULL
             EXCEPT
             SELECT sprf.libraryfile
@@ -97,17 +99,22 @@
                 AND spph.archive = a.id
                 AND p.id = a.owner
                 AND (
-                    (p.name IN %s AND a.purpose = %s)
+                    ((p.name IN %(blacklist)s
+                      OR (p.name || '/' || a.name) IN %(blacklist)s)
+                     AND a.purpose = %(ppa)s)
                     OR (a.private IS TRUE
-                        AND (p.name || '/' || a.name) NOT IN %s)
-                    OR a.purpose NOT IN %s
+                        AND (p.name || '/' || a.name) NOT IN %(whitelist)s)
+                    OR a.purpose NOT IN %(archive_types)s
                     OR dateremoved >
-                        CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - interval %s
+                        CURRENT_TIMESTAMP AT TIME ZONE 'UTC' -
+                        interval %(stay_of_execution)s
                     OR dateremoved IS NULL);
             """ % sqlvalues(
-                stay_of_execution, archive_types, self.blacklist,
-                ArchivePurpose.PPA, self.whitelist, archive_types,
-                stay_of_execution))
+                stay_of_execution=stay_of_execution,
+                archive_types=archive_types,
+                blacklist=self.blacklist,
+                whitelist=self.whitelist,
+                ppa=ArchivePurpose.PPA))
 
         lfa_ids = results.get_all()
         return lfa_ids
@@ -152,7 +159,9 @@
                 AND bpph.archive = a.id
                 AND p.id = a.owner
                 AND (
-                    (p.name IN %(blacklist)s AND a.purpose = %(ppa)s)
+                    ((p.name IN %(blacklist)s
+                      OR (p.name || '/' || a.name) IN %(blacklist)s)
+                     AND a.purpose = %(ppa)s)
                     OR (a.private IS TRUE
                         AND (p.name || '/' || a.name) NOT IN %(whitelist)s)
                     OR a.purpose NOT IN %(archive_types)s

=== modified file 'lib/lp/soyuz/scripts/tests/test_expire_archive_files.py'
--- lib/lp/soyuz/scripts/tests/test_expire_archive_files.py	2014-07-08 06:34:37 +0000
+++ lib/lp/soyuz/scripts/tests/test_expire_archive_files.py	2015-06-08 19:17:23 +0000
@@ -14,7 +14,6 @@
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.services.config import config
 from lp.services.log.logger import BufferLogger
-from lp.soyuz.enums import ArchivePurpose
 from lp.soyuz.scripts.expire_archive_files import ArchiveExpirer
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
 from lp.testing import TestCaseWithFactory
@@ -241,7 +240,7 @@
         self.archive2 = self.factory.makeArchive()
 
     def testBlacklistingWorks(self):
-        """Test that blacklisted PPAs are not expired."""
+        """Test that blacklisted PPA owners are not expired."""
         source, binary = self._setUpExpirablePublications(
             archive=self.archive)
         script = self.getScript()
@@ -251,6 +250,18 @@
         self.assertSourceNotExpired(source)
         self.assertBinaryNotExpired(binary)
 
+    def testBlacklistingArchivesWorks(self):
+        """Test that blacklisted individual PPAs are not expired."""
+        source, binary = self._setUpExpirablePublications(
+            archive=self.archive)
+        script = self.getScript()
+        script.blacklist = [
+            '%s/%s' % (self.archive.owner.name, self.archive.name)]
+        switch_dbuser(self.dbuser)
+        script.main()
+        self.assertSourceNotExpired(source)
+        self.assertBinaryNotExpired(binary)
+
     def testWhitelistingWorks(self):
         """Test that whitelisted private PPAs are expired anyway."""
         p3a = self.factory.makeArchive(private=True)