Merge lp:~cjwatson/launchpad/snap-build-pass-series into lp:launchpad

[Colin Watson]

Pass series name to snap builds, to make future LXD image creation easier.

I don't think it's absolutely required to put the series in the properties of a LXD image, but it seems like a good idea for debugging, and Stéphane's example chroot-to-LXD-image conversion script uses it.

[William Grant (wgrant)]

review: Approve

=== modified file 'lib/lp/snappy/model/snapbuildbehaviour.py'
--- lib/lp/snappy/model/snapbuildbehaviour.py	2017-07-24 15:19:50 +0000
+++ lib/lp/snappy/model/snapbuildbehaviour.py	2017-07-25 21:49:52 +0000
@@ -96,6 +96,7 @@
                     endpoint=config.snappy.builder_proxy_auth_api_endpoint,
                     token=token['username']))
         args["name"] = build.snap.name
+        args["series"] = build.distro_series.name
         args["arch_tag"] = build.distro_arch_series.architecturetag
         # XXX cjwatson 2015-08-03: Allow tools_source to be overridden at
         # some more fine-grained level.
 
=== modified file 'lib/lp/snappy/tests/test_snapbuildbehaviour.py'
--- lib/lp/snappy/tests/test_snapbuildbehaviour.py	2017-07-24 15:19:50 +0000
+++ lib/lp/snappy/tests/test_snapbuildbehaviour.py	2017-07-25 21:49:52 +0000
@@ -277,6 +277,7 @@
             "name": u"test-snap",
             "proxy_url": self.proxy_url,
             "revocation_endpoint": self.revocation_endpoint,
+            "series": "unstable",
             "trusted_keys": expected_trusted_keys,
             }, args)
 
@@ -299,6 +300,7 @@
             "name": u"test-snap",
             "proxy_url": self.proxy_url,
             "revocation_endpoint": self.revocation_endpoint,
+            "series": "unstable",
             "trusted_keys": expected_trusted_keys,
             }, args)
 
@@ -321,6 +323,7 @@
             "name": u"test-snap",
             "proxy_url": self.proxy_url,
             "revocation_endpoint": self.revocation_endpoint,
+            "series": "unstable",
             "trusted_keys": expected_trusted_keys,
             }, args)
 
@@ -345,6 +348,7 @@
             "name": u"test-snap",
             "proxy_url": self.proxy_url,
             "revocation_endpoint": self.revocation_endpoint,
+            "series": "unstable",
             "trusted_keys": expected_trusted_keys,
             }, args)
 
@@ -367,6 +371,7 @@
             "name": u"test-snap",
             "proxy_url": self.proxy_url,
             "revocation_endpoint": self.revocation_endpoint,
+            "series": "unstable",
             "trusted_keys": expected_trusted_keys,
             }, args)