Merge ~mwhudson/ubuntu-cdimage:ubuntu-core-installer-publication into ubuntu-cdimage:main

[Michael Hudson-Doyle]

update tree.py to handle publication of ubuntu-core-installer images.

This depends on https://code.launchpad.net/~mwhudson/debian-cd/+git/ubuntu/+merge/467309

[Steve Langasek (vorlon)]

could we get some corresponding tests please?

review: Needs Fixing

[Michael Hudson-Doyle (mwhudson)]

Added some tests, is that enough?

[Steve Langasek (vorlon)]

LGTM thanks

review: Approve

[Steve Langasek (vorlon)]

review: Approve

diff --git a/lib/cdimage/tests/test_tree.py b/lib/cdimage/tests/test_tree.py
index 63a5840..522229a 100644
--- a/lib/cdimage/tests/test_tree.py
+++ b/lib/cdimage/tests/test_tree.py
@@ -241,6 +241,8 @@ class TestPublisher(TestCase):
             ("daily-live", "ubuntu-core", "bionic", "live-core"),
             ("daily-live", "ubuntu-core-desktop", "mantic",
              "live-core-desktop"),
+            ("daily-live", "ubuntu-core-installer", "noble",
+             "ubuntu-core-installer"),
             ("daily", "ubuntu-base", "bionic", "base"),
             ("daily", "ubuntu-server", "bionic", "server"),
             ("daily", "ubuntu-server", "focal", "legacy-server"),
@@ -880,6 +882,12 @@ class TestDailyTreePublisher(TestCase):
                                 "daily-live").publish_base)
         self.assertEqual(
             os.path.join(
+                self.config.root, "www", "full", "ubuntu-core-installer",
+                "daily-live"),
+            self.make_publisher(
+                "ubuntu-core-installer", "daily-live").publish_base)
+        self.assertEqual(
+            os.path.join(
                 self.config.root, "www", "full", "kubuntu", "daily-live"),
             self.make_publisher("kubuntu", "daily-live").publish_base)
         self.config["DIST"] = "hoary"
diff --git a/lib/cdimage/tree.py b/lib/cdimage/tree.py
index 6fac63b..12a45e3 100644
--- a/lib/cdimage/tree.py
+++ b/lib/cdimage/tree.py
@@ -403,6 +403,8 @@ class Publisher:
                 return "netbook"
             elif self.project == "ubuntu-server":
                 return "live-server"
+            elif self.project == "ubuntu-core-installer":
+                return "ubuntu-core-installer"
             elif self.project in ("ubuntu-core", "ubuntu-appliance"):
                 return "live-core"
             elif self.project == "ubuntu-core-desktop":
@@ -440,7 +442,7 @@ class Publisher:
         elif publish_type in (
                 "desktop", "live", "netbook",
                 "live-core", "live-core-desktop",
-                "live-server"):
+                "live-server", "ubuntu-core-installer"):
             return "daily-live"
         elif publish_type == "minimal":
             return "daily-minimal"
@@ -499,6 +501,8 @@ class Publisher:
             return "Ubuntu Core %s" % cd
         elif publish_type == "live-core-desktop":
             return "Ubuntu Core Desktop %s" % cd
+        elif publish_type == "ubuntu-core-installer":
+            return "Ubuntu Core Installer %s" % cd
         elif publish_type == "desktop":
             return "desktop %s" % cd
         elif publish_type == "desktop-canary":
@@ -758,6 +762,9 @@ class Publisher:
         elif publish_type == "ubuntu-core-desktop":
             sentences.append(
                 "Experimental Ubuntu Core Desktop installer images.")
+        elif publish_type == "ubuntu-core-installer":
+            sentences.append(
+                "Experimental installer for Ubuntu Core.")
         elif publish_type == "ubuntu-appliance":
             sentences.append(
                 "An Ubuntu Appliance turns a computer into a specialised "
@@ -1127,6 +1134,7 @@ class Publisher:
             "preinstalled-core", "wubi",
             "live-core",
             "live-core-desktop",
+            "ubuntu-core-installer",
             "desktop-canary",
             "desktop-legacy",
         )