Merge lp:~vorlon/ubuntu-cdimage/match-series-for-current-triggers into lp:ubuntu-cdimage

[Steve Langasek]

[Adam Conrad (adconrad)]

Instead of adding the prev_series logic to the test, you could just hardcode, say, "precise-" in the series field of the triggers file, guaranteeing that we're testing that all new series are satisfied by that constraint.

Not a huge difference, but testing that "series" is contained in the set of "series - 1; continuing" is using the same set of methods to test in both directions, which means a bug in ordering would go unnoticed, as series-1+1 will always be series, even if the actual sort order is wrong.

Change or don't, but it also saves you a line of code. +1 with or without the above consideration.

(I assume merging this and pulling it on nusakan will come hand-in-hand with an edit of the production file)

review: Approve

=== modified file 'lib/cdimage/tests/test_tree.py'
--- lib/cdimage/tests/test_tree.py	2017-05-01 05:31:49 +0000
+++ lib/cdimage/tests/test_tree.py	2017-05-16 16:55:43 +0000
@@ -159,6 +159,7 @@
         publish_base = os.path.join(self.temp_dir, "www", "full", "daily-live")
         target_dir = os.path.join(publish_base, "20130321")
         series = Series.latest().name
+        prev_series = all_series[Series.latest().index - 1]
         for name in (
             "%s-desktop-i386.iso" % series,
             "%s-desktop-i386.manifest" % series,
@@ -168,7 +169,8 @@
             self.temp_dir, "production", "current-triggers")
         with mkfile(current_triggers_path) as current_triggers:
             print(
-                "ubuntu\tdaily-live\t%s\ti386" % series, file=current_triggers)
+                "ubuntu\tdaily-live\t%s-\ti386" % prev_series,
+                file=current_triggers)
         self.config["SSH_ORIGINAL_COMMAND"] = (
             "mark-current --project=ubuntu --series=%s --publish-type=desktop "
             "--architecture=i386 20130321" % series)

=== modified file 'lib/cdimage/tree.py'
--- lib/cdimage/tree.py	2017-05-01 05:31:49 +0000
+++ lib/cdimage/tree.py	2017-05-16 16:55:43 +0000
@@ -2331,7 +2331,7 @@
                     continue
                 if self.image_type != image_type:
                     continue
-                if self.config.full_series != series:
+                if not self.config.match_series(series):
                     continue
                 if arch in arches:
                     return True