Merge lp:~vorlon/ubuntu-cdimage/ubuntu-core-channels into lp:ubuntu-cdimage

[Steve Langasek]

Support has landed in launchpad-buildd and livecd-rootfs (in bionic-proposed) for building ubuntu-core images from a different snap channel than the default of 'edge'. This is the last piece to let us leverage that for automatic builds of images for multiple channels, using a single livefs definition.

[lp:~vorlon/ubuntu-cdimage/ubuntu-core-channels]

1705. By Steve Langasek on 2018-01-16

Explicit test that we construct the correct publication path when using a non-default channel

=== modified file 'lib/cdimage/config.py'
--- lib/cdimage/config.py	2017-11-08 22:52:38 +0000
+++ lib/cdimage/config.py	2018-01-16 03:16:21 +0000
@@ -256,6 +256,7 @@
     "UBUNTU_DEFAULTS_LOCALE",
     "SSH_ORIGINAL_COMMAND",
     "EXTRA_PPAS",
+    "CHANNEL",
 )
 
 
 
=== modified file 'lib/cdimage/livefs.py'
--- lib/cdimage/livefs.py	2017-11-16 17:29:08 +0000
+++ lib/cdimage/livefs.py	2018-01-16 03:16:21 +0000
@@ -229,6 +229,14 @@
     if config["EXTRA_PPAS"]:
         metadata_override["extra_ppas"] = config["EXTRA_PPAS"].split()
 
+    if config["CHANNEL"]:
+        try:
+            kwargs["unique_key"] += "_" + config["CHANNEL"]
+        except KeyError:
+            kwargs["unique_key"] = config["CHANNEL"]
+
+        metadata_override["channel"] = config["CHANNEL"]
+
     if metadata_override:
         kwargs["metadata_override"] = metadata_override
 
 
=== modified file 'lib/cdimage/tests/test_tree.py'
--- lib/cdimage/tests/test_tree.py	2017-11-08 04:57:34 +0000
+++ lib/cdimage/tests/test_tree.py	2018-01-16 03:16:21 +0000
@@ -696,6 +696,12 @@
                 self.config.root, "www", "full", "ubuntu-core",
                 self.config.core_series, "edge"),
             self.make_publisher("ubuntu-core", "daily-live").publish_base)
+        self.config["CHANNEL"] = 'stable'
+        self.assertEqual(
+            os.path.join(
+                self.config.root, "www", "full", "ubuntu-core",
+                self.config.core_series, "stable"),
+            self.make_publisher("ubuntu-core", "daily-live").publish_base)
         self.assertEqual(
             os.path.join(
                 self.config.root, "www", "full", "kubuntu", "daily-live"),
 
=== modified file 'lib/cdimage/tree.py'
--- lib/cdimage/tree.py	2017-11-13 16:16:42 +0000
+++ lib/cdimage/tree.py	2018-01-16 03:16:21 +0000
@@ -1709,7 +1709,8 @@
     def image_type_dir(self):
         if (self.config.project == "ubuntu-core" and
                 self.image_type == 'daily-live'):
-            return os.path.join(self.config.core_series, 'edge')
+            channel = self.config.get("CHANNEL", "edge")
+            return os.path.join(self.config.core_series, channel)
         image_type_dir = self.image_type.replace("_", "/")
         if (self.config.distribution != "ubuntu" or
                 not self.config["DIST"].is_latest):