Merge lp:~cyphermox/ubuntu-cdimage/cpc-in-server into lp:ubuntu-cdimage

[Mathieu Trudel-Lapierre]

Drop the cpc images in ubuntu-server tree.

=== modified file 'lib/cdimage/tests/test_tree.py'
--- lib/cdimage/tests/test_tree.py	2016-03-09 15:01:54 +0000
+++ lib/cdimage/tests/test_tree.py	2016-04-19 16:33:58 +0000
@@ -259,6 +259,8 @@
              "preinstalled-touch"),
             ("daily-preinstalled", "ubuntu-pd", "vivid",
              "preinstalled-pd"),
+            ("daily-preinstalled", "ubuntu-cpc", "xenial",
+             "preinstalled-server"),
             ("daily-live", "edubuntu", "edgy", "live"),
             ("daily-live", "edubuntu", "feisty", "desktop"),
             ("daily-live", "kubuntu-netbook", "lucid", "netbook"),
@@ -677,6 +679,12 @@
     def test_publish_base(self):
         self.assertEqual(
             os.path.join(
+                self.config.root, "www", "full",
+                "ubuntu-server", "daily-preinstalled"),
+            self.make_publisher("ubuntu-cpc",
+                                "daily-preinstalled").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"

=== modified file 'lib/cdimage/tree.py'
--- lib/cdimage/tree.py	2016-04-18 17:38:39 +0000
+++ lib/cdimage/tree.py	2016-04-19 16:33:58 +0000
@@ -156,6 +156,8 @@
         """Return the per-project base directory within this tree."""
         if self.config.project == "ubuntu":
             return self.directory
+        elif self.config.project == "ubuntu-cpc":
+            return os.path.join(self.directory, "ubuntu-server")
         else:
             return os.path.join(self.directory, self.config.project)