Merge ~mwhudson/ubuntu-cdimage:remove-touch-support into ubuntu-cdimage:main

[Michael Hudson-Doyle]

remove all references to ubuntu touch

sniff

[Steve Langasek (vorlon)]

Requires some slightly non-trivial fix-ups in merge due to the dropping of Chinese / localization support in the meantime, but the obvious conflict resolution is correct and passes tests, so landing as-is.

review: Approve

diff --git a/bin/rebuild-requests b/bin/rebuild-requests
index fb65dbe..bac320d 100755
--- a/bin/rebuild-requests
+++ b/bin/rebuild-requests
@@ -179,12 +179,6 @@ def main():
             if sub_project:
                 env['SUBPROJECT'] = sub_project
 
-            if (project == "ubuntu-touch" and
-                    args[0] in ("bionic", "focal")):
-                env['EXTRA_PPAS'] = \
-                    "ci-train-ppa-service/stable-phone-overlay:1001"
-                env['PROPOSED'] = "0"
-
             env['ARCHES'] = arches
             env['DIST'] = entries[0][0].series_title.lower()
 
diff --git a/etc/default-arches b/etc/default-arches
index 38f7880..2c7960a 100644
--- a/etc/default-arches
+++ b/etc/default-arches
@@ -7,8 +7,6 @@
 # *			source			focal-			amd64
 *			source			*			i386
 
-ubuntu-touch		daily-preinstalled	bionic-			armhf i386 arm64
-
 ubuntu-base		daily			bionic			amd64 arm64 armhf i386 ppc64el s390x
 ubuntu-base		daily			focal-			amd64 arm64 armhf ppc64el riscv64 s390x
 ubuntu-core-system-image	daily-preinstalled	xenial-		amd64 arm64 armhf i386 ppc64el s390x
diff --git a/etc/livefs-launchpad b/etc/livefs-launchpad
index 3b37ee6..e29c42d 100644
--- a/etc/livefs-launchpad
+++ b/etc/livefs-launchpad
@@ -30,8 +30,6 @@ ubuntu-gnome		daily-live		*		*		ubuntu-cdimage/ubuntu-gnome
 ubuntu-mate		daily-live		*		*		ubuntu-cdimage/ubuntu-mate
 ubuntu-budgie		daily-live		*		*		ubuntu-cdimage/ubuntu-budgie
 ubuntu-budgie-legacy	daily-legacy		*		*		ubuntu-cdimage/ubuntu-budgie-legacy
-ubuntu-touch		daily-preinstalled	ubuntu-rtm/*	*		ubuntu-cdimage/ubuntu-touch
-ubuntu-touch		daily-preinstalled	bionic-		*		ubuntu-cdimage/ubuntu-touch
 ubuntu-unity		daily-live		*		*		ubuntu-cdimage/ubuntu-unity
 ubuntucinnamon		daily-live		*		*		ubuntu-cdimage/ubuntucinnamon
 ubuntu-wubi		wubi			*		*		ubuntu-cdimage/ubuntu-wubi
diff --git a/etc/purge-days b/etc/purge-days
index 8a0e7ea..94ba01d 100644
--- a/etc/purge-days
+++ b/etc/purge-days
@@ -9,7 +9,6 @@ dvd 2
 # Ubuntu Core images are not purged per age
 ubuntu-core 0
 ubuntu-appliance 0
-ubuntu-touch 7
 source 1
 wubi 1
 ubuntu-zh_CN 3
diff --git a/etc/qa-products b/etc/qa-products
index f64820e..22f65ae 100644
--- a/etc/qa-products
+++ b/etc/qa-products
@@ -97,10 +97,6 @@ Ubuntu Server Subiquity riscv64					ubuntu-server/live	daily-live			live-server	
 Ubuntu Studio DVD amd64						ubuntustudio	dvd					dvd						amd64			iso
 Ubuntu Studio DVD i386						ubuntustudio	dvd					dvd						i386			iso
 
-# Ubuntu Touch
-Ubuntu Touch armhf							ubuntu-touch	daily-preinstalled	preinstalled-touch		armhf			iso
-Ubuntu Touch i386							ubuntu-touch	daily-preinstalled	preinstalled-touch		i386			iso
-
 # Ubuntu Kylin
 Ubuntu Kylin Desktop amd64					ubuntukylin		daily-live			desktop					amd64			iso
 Ubuntu Kylin Desktop i386					ubuntukylin		daily-live			desktop					i386			iso
diff --git a/lib/cdimage/build.py b/lib/cdimage/build.py
index 447a553..edb6dd5 100644
--- a/lib/cdimage/build.py
+++ b/lib/cdimage/build.py
@@ -43,7 +43,6 @@ from cdimage.mail import get_notify_addresses, send_mail
 from cdimage.mirror import trigger_mirrors
 from cdimage.tracker import tracker_set_rebuild_status
 from cdimage.tree import Publisher, Tree
-from cdimage.config import Touch
 
 __metaclass__ = type
 
@@ -361,38 +360,6 @@ def build_ubuntu_defaults_locale(config):
                     [pi_makelist, entry_path], stdout=list_file)
 
 
-def add_android_support(config, arch, output_dir):
-    """Copy Android support files to an Ubuntu Touch image.
-    """
-    live_scratch_dir = os.path.join(
-        config.root, "scratch", config.subtree, config.project,
-        config.full_series, config.image_type, "live")
-
-    # copy recovery, boot and system imgs in place
-    for target in Touch.list_targets_by_ubuntu_arch(arch):
-        boot_img_src = "boot-%s+%s.img" % (target.ubuntu_arch, target.subarch)
-        boot_img = "%s-preinstalled-boot-%s+%s.img" % (
-            config.series, arch, target.subarch)
-        system_img_src = "system-%s+%s.img" % (
-            target.android_arch, target.subarch)
-        system_img = "%s-preinstalled-system-%s+%s.img" % (
-            config.series, target.android_arch, target.subarch)
-        recovery_img_src = "recovery-%s+%s.img" % (
-            target.android_arch, target.subarch)
-        recovery_img = "%s-preinstalled-recovery-%s+%s.img" % (
-            config.series, target.android_arch, target.subarch)
-
-        shutil.copy2(
-            os.path.join(live_scratch_dir, boot_img_src),
-            os.path.join(output_dir, boot_img))
-        shutil.copy2(
-            os.path.join(live_scratch_dir, system_img_src),
-            os.path.join(output_dir, system_img))
-        shutil.copy2(
-            os.path.join(live_scratch_dir, recovery_img_src),
-            os.path.join(output_dir, recovery_img))
-
-
 def build_livecd_base(config):
     log_marker("Downloading live filesystem images")
     download_live_filesystems(config)
@@ -500,7 +467,7 @@ def build_livecd_base(config):
                 shutil.copy2(
                     live_qcow2, "%s.qcow2" % output_prefix)
 
-    if (config.project in ("ubuntu-base", "ubuntu-touch") or
+    if (config.project == "ubuntu-base" or
         (config.project == "ubuntu-core" and
          config.subproject == "system-image")):
         log_marker("Copying images to debian-cd output directory")
@@ -521,23 +488,11 @@ def build_livecd_base(config):
                 elif config.project == "ubuntu-base":
                     output_prefix = os.path.join(
                         output_dir, "%s-base-%s" % (config.series, arch))
-                elif config.project == "ubuntu-touch":
-                    output_prefix = os.path.join(
-                        output_dir,
-                        "%s-preinstalled-touch-%s" % (config.series, arch))
                 shutil.copy2(rootfs, "%s.raw" % output_prefix)
                 with open("%s.type" % output_prefix, "w") as f:
                     print("tar archive", file=f)
                 shutil.copy2(
                     "%s.manifest" % live_prefix, "%s.manifest" % output_prefix)
-                if config.project == "ubuntu-touch":
-                    osextras.link_force(
-                        "%s.raw" % output_prefix, "%s.tar.gz" % output_prefix)
-                    add_android_support(config, arch, output_dir)
-                    custom = "%s.custom.tar.gz" % live_prefix
-                    if os.path.exists(custom):
-                        shutil.copy2(
-                            custom, "%s.custom.tar.gz" % output_prefix)
                 if config.project == "ubuntu-core":
                     for dev in ("azure.device", "device", "raspi2.device",
                                 "plano.device"):
@@ -664,7 +619,7 @@ def is_live_fs_only(config):
     live_fs_only = False
     if config.project in (
             "livecd-base", "ubuntu-base", "ubuntu-core",
-            "ubuntu-core-desktop", "ubuntu-appliance", "ubuntu-touch"):
+            "ubuntu-core-desktop", "ubuntu-appliance"):
         live_fs_only = True
     elif (config.project in ("ubuntu", "ubuntu-server") and
           config.image_type == "daily-preinstalled"):
diff --git a/lib/cdimage/config.py b/lib/cdimage/config.py
index 9b5acea..e9342cd 100644
--- a/lib/cdimage/config.py
+++ b/lib/cdimage/config.py
@@ -260,43 +260,8 @@ all_series.extend([
         _core_series="22",  # XXX: temporary for Core Desktop experiments
         all_lts_projects=True),
     Series("noble", "24.04", "Noble Numbat"),
-
-    Series("14.09", "14.09", "RTM 14.09", distribution="ubuntu-rtm"),
-    Series(
-        "14.09-factory", "14.09.1", "RTM 14.09-factory",
-        distribution="ubuntu-rtm"),
 ])
 
-all_touch_targets = []
-
-
-class Touch:
-    def __init__(self, subarch, android_arch, ubuntu_arch):
-        self.subarch = subarch
-        self.android_arch = android_arch
-        self.ubuntu_arch = ubuntu_arch
-
-    @classmethod
-    def list_android_arches(self):
-        return list(set([touch.android_arch for touch in all_touch_targets]))
-
-    @classmethod
-    def list_ubuntu_arches(self):
-        return list(set([touch.ubuntu_arch for touch in all_touch_targets]))
-
-    @classmethod
-    def list_targets_by_ubuntu_arch(self, arch):
-        return [target for target in all_touch_targets
-                if target.ubuntu_arch == arch]
-
-
-# TODO: This should probably come from a configuration file.
-all_touch_targets.extend([
-    Touch("mako", "armel", "armhf"),
-    Touch("generic", "armel", "armhf"),
-    Touch("generic_x86", "i386", "i386"),
-    Touch("flo", "armel", "armhf"),
-])
 
 _allowed_keys = (
     "PROJECT",
diff --git a/lib/cdimage/livefs.py b/lib/cdimage/livefs.py
index 598035b..6646334 100644
--- a/lib/cdimage/livefs.py
+++ b/lib/cdimage/livefs.py
@@ -34,7 +34,6 @@ except ImportError:
     from urllib2 import URLError, unquote, urlopen
 
 from cdimage import osextras, sign
-from cdimage.config import Touch
 from cdimage.launchpad import get_launchpad
 from cdimage.log import logger
 from cdimage.mail import get_notify_addresses, send_mail
@@ -120,7 +119,7 @@ def live_build_options(config, arch):
         elif subarch in ("ac100", "nexus7"):
             options.extend(["-f", "plain"])
 
-    if config.project in ("ubuntu-base", "ubuntu-core", "ubuntu-touch"):
+    if config.project in ("ubuntu-base", "ubuntu-core"):
         options.extend(["-f", "plain"])
 
     if config.subproject == "wubi":
@@ -597,19 +596,6 @@ def live_item_paths(config, arch, item):
             for url in urls_for("livecd." + liveproject_subarch,
                                 item + "-" + flavour):
                 yield url
-    elif item in (
-        "boot-%s+%s.img" % (target.ubuntu_arch, target.subarch)
-            for target in Touch.list_targets_by_ubuntu_arch(arch)
-    ) or item in (
-        "recovery-%s+%s.img" % (target.android_arch, target.subarch)
-            for target in Touch.list_targets_by_ubuntu_arch(arch)
-    ) or item in (
-        "system-%s+%s.img" % (target.android_arch, target.subarch)
-            for target in Touch.list_targets_by_ubuntu_arch(arch)
-    ):
-        for flavour in flavours(config, arch):
-            for url in urls_for("livecd." + liveproject_subarch, item):
-                yield url
     elif item == "kernel-efi-signed":
         if arch == "amd64":
             for flavour in flavours(config, arch):
@@ -659,17 +645,6 @@ def download_live_items(config, arch, item):
             except osextras.FetchError:
                 pass
     elif item in (
-        "boot-%s+%s.img" % (target.ubuntu_arch, target.subarch)
-            for target in Touch.list_targets_by_ubuntu_arch(arch)
-    ):
-        for url in urls:
-            target = os.path.join(output_dir, item)
-            try:
-                osextras.fetch(config, url, target)
-                found = True
-            except osextras.FetchError:
-                pass
-    elif item in (
         "modules.squashfs",
     ):
         for url in urls:
@@ -681,28 +656,6 @@ def download_live_items(config, arch, item):
                 found = True
             except osextras.FetchError:
                 pass
-    elif item in (
-        "recovery-%s+%s.img" % (target.android_arch, target.subarch)
-            for target in Touch.list_targets_by_ubuntu_arch(arch)
-    ):
-        for url in urls:
-            target = os.path.join(output_dir, item)
-            try:
-                osextras.fetch(config, url, target)
-                found = True
-            except osextras.FetchError:
-                pass
-    elif item in (
-        "system-%s+%s.img" % (target.android_arch, target.subarch)
-            for target in Touch.list_targets_by_ubuntu_arch(arch)
-    ):
-        for url in urls:
-            target = os.path.join(output_dir, item)
-            try:
-                osextras.fetch(config, url, target)
-                found = True
-            except osextras.FetchError:
-                pass
     elif item == "kernel-efi-signed":
         for url in urls:
             base = unquote(os.path.basename(url))
@@ -845,31 +798,6 @@ def download_live_filesystems(config):
         if not got_image:
             raise NoFilesystemImages("No filesystem images found.")
 
-    if config.project == "ubuntu-touch":
-        for arch in config.arches:
-            for abootimg in (
-                "boot-%s+%s.img" % (target.ubuntu_arch, target.subarch)
-                    for target in Touch.list_targets_by_ubuntu_arch(arch)
-            ):
-                download_live_items(
-                    config, arch, abootimg
-                )
-            for recoveryimg in (
-                "recovery-%s+%s.img" % (target.android_arch, target.subarch)
-                    for target in Touch.list_targets_by_ubuntu_arch(arch)
-            ):
-                download_live_items(
-                    config, arch, recoveryimg
-                )
-            for systemimg in (
-                "system-%s+%s.img" % (target.android_arch, target.subarch)
-                    for target in Touch.list_targets_by_ubuntu_arch(arch)
-            ):
-                download_live_items(
-                    config, arch, systemimg
-                )
-            download_live_items(config, arch, "custom.tar.gz")
-
     if config.project == "ubuntu-core":
         for arch in config.arches:
             download_live_items(config, arch, "device.tar.gz")
diff --git a/lib/cdimage/project.py b/lib/cdimage/project.py
index b8cf15e..318ed37 100644
--- a/lib/cdimage/project.py
+++ b/lib/cdimage/project.py
@@ -20,8 +20,8 @@ import os
 
 # Be careful about the values here; in most cases they are passed to
 # debian-cd, which will get upset if they contain a space, hence all the
-# odd-looking hyphens.  ubuntu-zh_CN and ubuntu-touch-preview are exceptions
-# to this, because they do not use debian-cd.
+# odd-looking hyphens.  ubuntu-zh_CN is an exception to this, because it
+# does not use debian-cd.
 # For projects that use debian-cd, it will construct an ISO9660 volume ID
 # as "$(CAPPROJECT) $(DEBVERSION) $(ARCH)", e.g. "Ubuntu 14.10 amd64"; for
 # powerpc, $(ARCH) is abbreviated to "ppc".  The volume ID is limited to 32
@@ -50,8 +50,6 @@ project_map = {
     "ubuntu-core-desktop": "Ubuntu Core Desktop",
     "ubuntu-appliance": "Ubuntu Appliance",
     "ubuntu-base": "Ubuntu-Base",
-    "ubuntu-touch-preview": "Ubuntu Touch Preview",
-    "ubuntu-touch": "Ubuntu Touch",
     "ubuntu-mini-iso": "Ubuntu-Mini-ISO",
 }
 
diff --git a/lib/cdimage/tests/test_build.py b/lib/cdimage/tests/test_build.py
index 1cdc4ba..2ddaffc 100644
--- a/lib/cdimage/tests/test_build.py
+++ b/lib/cdimage/tests/test_build.py
@@ -58,7 +58,7 @@ from cdimage.build import (
     sync_local_mirror,
     want_live_builds,
 )
-from cdimage.config import Config, Touch
+from cdimage.config import Config
 from cdimage.log import logger
 from cdimage.mail import text_file_type
 from cdimage.tests.helpers import TestCase, mkfile, touch
@@ -428,70 +428,6 @@ class TestBuildLiveCDBase(TestCase):
             "amd64.qcow2",
         ], os.listdir(output_dir))
 
-    @mock.patch("cdimage.osextras.fetch")
-    def _perform_ubuntu_touch_testing(self, project, mock_fetch):
-        '''Convenience function for testing ubuntu-touch* builds.'''
-        def fetch_side_effect(config, source, target):
-            if (target.endswith(".manifest") or
-                    target.endswith(".rootfs.tar.gz") or
-                    target.endswith(".custom.tar.gz") or
-                    target.endswith(".img")):
-                touch(target)
-            else:
-                raise osextras.FetchError
-
-        mock_fetch.side_effect = fetch_side_effect
-        self.config["CDIMAGE_PREINSTALLED"] = "1"
-        self.config["PROJECT"] = project
-        self.config["DIST"] = "bionic"
-        self.config["IMAGE_TYPE"] = "daily-preinstalled"
-        self.config["ARCHES"] = "armhf"
-        self.capture_logging()
-        build_livecd_base(self.config)
-        self.assertLogEqual([
-            "===== Downloading live filesystem images =====",
-            self.epoch_date,
-            "===== Copying images to debian-cd output directory =====",
-            self.epoch_date,
-        ])
-        output_dir = os.path.join(
-            self.temp_dir, "scratch", project, "bionic",
-            "daily-preinstalled", "debian-cd", "armhf")
-        self.assertTrue(os.path.isdir(output_dir))
-        touch_files = ["bionic-preinstalled-boot-%s+%s.img" % (
-            touch_target.ubuntu_arch, touch_target.subarch)
-            for touch_target in Touch.list_targets_by_ubuntu_arch("armhf")]
-        touch_files.extend(["bionic-preinstalled-recovery-%s+%s.img" % (
-            touch_target.android_arch, touch_target.subarch)
-            for touch_target in Touch.list_targets_by_ubuntu_arch("armhf")])
-        touch_files.extend(["bionic-preinstalled-system-%s+%s.img" % (
-            touch_target.android_arch, touch_target.subarch)
-            for touch_target in Touch.list_targets_by_ubuntu_arch("armhf")])
-        touch_files.extend([
-            "bionic-preinstalled-touch-armhf.manifest",
-            "bionic-preinstalled-touch-armhf.raw",
-            "bionic-preinstalled-touch-armhf.type",
-            "bionic-preinstalled-touch-armhf.tar.gz",
-            "bionic-preinstalled-touch-armhf.custom.tar.gz",
-            ])
-        self.assertCountEqual(touch_files, os.listdir(output_dir))
-        with open(os.path.join(
-            output_dir, "bionic-preinstalled-touch-armhf.type")
-        ) as f:
-            self.assertEqual("tar archive\n", f.read())
-        for touch_target in Touch.list_targets_by_ubuntu_arch("armhf"):
-            system_img = "bionic-preinstalled-system-%s+%s.img" % (
-                touch_target.android_arch, touch_target.subarch)
-            recovery_img = "bionic-preinstalled-recovery-%s+%s.img" % (
-                touch_target.android_arch, touch_target.subarch)
-            self.assertTrue(os.path.exists(
-                os.path.join(output_dir, system_img)))
-            self.assertTrue(os.path.exists(
-                os.path.join(output_dir, recovery_img)))
-
-    def test_ubuntu_touch(self):
-        self._perform_ubuntu_touch_testing("ubuntu-touch")
-
 
 class TestBuildImageSet(TestCase):
     def setUp(self):
diff --git a/lib/cdimage/tests/test_build_id.py b/lib/cdimage/tests/test_build_id.py
index 7bd6bb3..3063319 100644
--- a/lib/cdimage/tests/test_build_id.py
+++ b/lib/cdimage/tests/test_build_id.py
@@ -78,21 +78,6 @@ class TestNextBuildId(TestCase):
             self.assertEqual("20130225:1\n", stamp_file.read())
 
     @mock.patch("time.strftime", return_value="20130225")
-    def test_ubuntu_rtm(self, *args):
-        config = Config(read=False)
-        config.root = self.use_temp_dir()
-        config["PROJECT"] = "ubuntu-touch"
-        config["DIST"] = "ubuntu-rtm/14.09"
-        os.mkdir(os.path.join(self.temp_dir, "etc"))
-        stamp = os.path.join(
-            config.root, "etc",
-            ".next-build-suffix-ubuntu-touch-ubuntu-rtm-14.09-daily")
-        self.assertFalse(os.path.exists(stamp))
-        self.assertEqual("20130225", next_build_id(config, ""))
-        with open(stamp) as stamp_file:
-            self.assertEqual("20130225:1\n", stamp_file.read())
-
-    @mock.patch("time.strftime", return_value="20130225")
     def test_date_suffix(self, *args):
         config = Config(read=False)
         config.root = self.use_temp_dir()
diff --git a/lib/cdimage/tests/test_config.py b/lib/cdimage/tests/test_config.py
index ab07f38..3106ff6 100644
--- a/lib/cdimage/tests/test_config.py
+++ b/lib/cdimage/tests/test_config.py
@@ -40,10 +40,6 @@ class TestSeries(TestCase):
     def test_latest(self):
         self.assertTrue(Series.latest().is_latest)
         self.assertEqual("ubuntu", Series.latest().distribution)
-        self.assertTrue(Series.latest(distribution="ubuntu-rtm").is_latest)
-        self.assertEqual(
-            "ubuntu-rtm",
-            Series.latest(distribution="ubuntu-rtm").distribution)
         self.assertRaises(
             ValueError, Series.latest, distribution="nonexistent")
 
@@ -73,20 +69,14 @@ class TestSeries(TestCase):
     def test_str(self):
         series = Series.find_by_name("warty")
         self.assertEqual("warty", str(series))
-        series = Series.find_by_name("ubuntu-rtm/14.09")
-        self.assertEqual("14.09", str(series))
 
     def test_full_name(self):
         series = Series.find_by_name("utopic")
         self.assertEqual("utopic", series.full_name)
-        series = Series.find_by_name("ubuntu-rtm/14.09")
-        self.assertEqual("ubuntu-rtm/14.09", series.full_name)
 
     def test_format(self):
         series = Series.find_by_name("warty")
         self.assertEqual("warty", "%s" % series)
-        series = Series.find_by_name("ubuntu-rtm/14.09")
-        self.assertEqual("14.09", "%s" % series)
 
     def test_is_latest(self):
         self.assertFalse(all_series[0].is_latest)
@@ -125,8 +115,6 @@ class TestSeries(TestCase):
     def test_distribution(self):
         series = Series.find_by_name("utopic")
         self.assertEqual("ubuntu", series.distribution)
-        series = Series.find_by_name("ubuntu-rtm/14.09")
-        self.assertEqual("ubuntu-rtm", series.distribution)
 
 
 class TestConfig(TestCase):
@@ -321,14 +309,6 @@ class TestConfig(TestCase):
         self.assertFalse(config.match_series("-oneiric"))
         self.assertFalse(config.match_series("lucid"))
         self.assertTrue(config.match_series("precise"))
-        self.assertFalse(config.match_series("ubuntu-rtm/*"))
-        self.assertFalse(config.match_series("ubuntu-rtm/14.09-"))
-        config["DIST"] = "ubuntu-rtm/14.09"
-        self.assertTrue(config.match_series("*"))
-        self.assertFalse(config.match_series("ubuntu/*"))
-        self.assertFalse(config.match_series("precise-"))
-        self.assertTrue(config.match_series("ubuntu-rtm/*"))
-        self.assertTrue(config.match_series("ubuntu-rtm/14.09-"))
 
     def test_arches_override(self):
         # If ARCHES is set in the environment, it overrides
@@ -394,8 +374,6 @@ class TestConfig(TestCase):
         config = Config(read=False)
         config["DIST"] = "utopic"
         self.assertEqual("ubuntu", config.distribution)
-        config["DIST"] = "ubuntu-rtm/14.09"
-        self.assertEqual("ubuntu-rtm", config.distribution)
 
     def test_series(self):
         config = Config(read=False)
@@ -406,8 +384,6 @@ class TestConfig(TestCase):
         config = Config(read=False)
         config["DIST"] = "utopic"
         self.assertEqual("utopic", config.full_series)
-        config["DIST"] = "ubuntu-rtm/14.09"
-        self.assertEqual("ubuntu-rtm/14.09", config.full_series)
 
     def test_core_series(self):
         config = Config(read=False)
diff --git a/lib/cdimage/tests/test_livefs.py b/lib/cdimage/tests/test_livefs.py
index 6ae2697..03681a2 100644
--- a/lib/cdimage/tests/test_livefs.py
+++ b/lib/cdimage/tests/test_livefs.py
@@ -345,11 +345,6 @@ class TestLiveBuildOptions(TestCase):
         self.assertEqual(
             ["-f", "plain"], live_build_options(self.config, "i386"))
 
-    def test_ubuntu_touch(self):
-        self.config["PROJECT"] = "ubuntu-touch"
-        self.assertEqual(
-            ["-f", "plain"], live_build_options(self.config, "armhf"))
-
     def test_wubi(self):
         self.config["SUBPROJECT"] = "wubi"
         for series, fstype in (
@@ -738,73 +733,6 @@ class TestRunLiveBuilds(TestCase):
         self.assertEqual("Successfully built", builds[1].buildstate)
         self.assertEqual(0, mock_live_build_notify_failure.call_count)
 
-    @skipUnless(launchpad_available, "launchpadlib not available")
-    @mock_strftime(1363355331)
-    @mock.patch("time.sleep")
-    @mock.patch("cdimage.livefs.tracker_set_rebuild_status")
-    @mock.patch("cdimage.livefs.live_build_notify_failure")
-    @mock.patch("cdimage.tests.test_livefs.MockLiveFSBuild._iter_buildstate")
-    @mock.patch("cdimage.launchpad.login")
-    def test_run_live_builds_lp_ubuntu_rtm(self, mock_login,
-                                           mock_iter_buildstate,
-                                           mock_live_build_notify_failure,
-                                           mock_tracker_set_rebuild_status,
-                                           mock_sleep, *args):
-        self.config["PROJECT"] = "ubuntu-touch"
-        self.config["DIST"] = "ubuntu-rtm/14.09"
-        self.config["IMAGE_TYPE"] = "daily-preinstalled"
-        self.config["ARCHES"] = "armhf i386"
-        osextras.unlink_force(os.path.join(
-            self.config.root, "production", "livefs-builders"))
-        with mkfile(os.path.join(
-                self.config.root, "production", "livefs-launchpad")) as f:
-            print(
-                "ubuntu-touch\tdaily-preinstalled\tubuntu-rtm/*\t*\t"
-                "dogfood/ubuntu-cdimage/ubuntu-touch", file=f)
-            print(
-                "ubuntu-touch\tdaily-preinstalled\t*\t*\t"
-                "ubuntu-cdimage/ubuntu-touch", file=f)
-        self.capture_logging()
-        mock_login.return_value = MockLaunchpad()
-        mock_iter_buildstate.side_effect = lambda: (
-            chain(["Needs building"] * 3, repeat("Successfully built")))
-        self.assertCountEqual(["armhf", "i386"], run_live_builds(self.config))
-        self.assertCountEqual([
-            "ubuntu-touch-armhf on Launchpad starting at 2013-03-15 13:48:51",
-            "ubuntu-touch-armhf: https://launchpad.example/armhf-build",
-            "ubuntu-touch-i386 on Launchpad starting at 2013-03-15 13:48:51",
-            "ubuntu-touch-i386: https://launchpad.example/i386-build",
-            "ubuntu-touch-armhf on Launchpad finished at 2013-03-15 13:48:51 "
-            "(Successfully built)",
-            "ubuntu-touch-i386 on Launchpad finished at 2013-03-15 13:48:51 "
-            "(Successfully built)",
-        ], self.captured_log_messages())
-        self.assertEqual(4, mock_tracker_set_rebuild_status.call_count)
-        mock_tracker_set_rebuild_status.assert_has_calls([
-            mock.call(self.config, [0, 1], 2, "armhf"),
-            mock.call(self.config, [0, 1], 2, "i386"),
-            mock.call(self.config, [0, 1, 2], 3, "armhf"),
-            mock.call(self.config, [0, 1, 2], 3, "i386"),
-        ])
-        self.assertEqual(3, mock_sleep.call_count)
-        mock_sleep.assert_has_calls([mock.call(15)] * 3)
-        lp = get_launchpad()
-        owner = lp.people["ubuntu-cdimage"]
-        ubuntu_rtm = lp.distributions["ubuntu-rtm"]
-        series = ubuntu_rtm.getSeries(name_or_version="14.09")
-        dases = [
-            series.getDistroArchSeries(archtag)
-            for archtag in ("armhf", "i386")]
-        self.assertEqual(2, len(dases))
-        livefs = lp.livefses.getByName(
-            owner=owner, distro_series=series, name="ubuntu-touch")
-        builds = [
-            livefs.getLatestBuild(distro_arch_series=das) for das in dases]
-        self.assertEqual(2, len(builds))
-        self.assertEqual("Successfully built", builds[0].buildstate)
-        self.assertEqual("Successfully built", builds[1].buildstate)
-        self.assertEqual(0, mock_live_build_notify_failure.call_count)
-
 
 class TestLiveCDBase(TestCase):
     def setUp(self):
diff --git a/lib/cdimage/tests/test_tree.py b/lib/cdimage/tests/test_tree.py
index f416301..25207f9 100644
--- a/lib/cdimage/tests/test_tree.py
+++ b/lib/cdimage/tests/test_tree.py
@@ -254,8 +254,6 @@ class TestPublisher(TestCase):
              "preinstalled-server"),
             ("daily-preinstalled", "ubuntu", "bionic",
              "preinstalled-desktop"),
-            ("daily-preinstalled", "ubuntu-touch", "bionic",
-             "preinstalled-touch"),
             ("daily-live", "edubuntu", "lunar", "desktop"),
             ("daily-live", "ubuntu-server", "bionic", "live-server"),
             ("daily-live", "ubuntu", "bionic", "desktop"),
@@ -861,13 +859,6 @@ class TestDailyTreePublisher(TestCase):
                 self.config.root, "scratch", "kubuntu", "hoary", "daily",
                 "debian-cd", "i386"),
             self.make_publisher("kubuntu", "daily").image_output("i386"))
-        self.config["DIST"] = "ubuntu-rtm/14.09"
-        self.assertEqual(
-            os.path.join(
-                self.config.root, "scratch", "ubuntu-touch", "ubuntu-rtm",
-                "14.09", "daily-preinstalled", "debian-cd", "armhf"),
-            self.make_publisher(
-                "ubuntu-touch", "daily-preinstalled").image_output("armhf"))
 
     def test_source_extension(self):
         self.assertEqual(
@@ -920,13 +911,6 @@ class TestDailyTreePublisher(TestCase):
                 self.config.root, "www", "full",
                 "kubuntu", "hoary", "daily-live"),
             self.make_publisher("kubuntu", "daily-live").publish_base)
-        self.config["DIST"] = "ubuntu-rtm/14.09"
-        self.assertEqual(
-            os.path.join(
-                self.config.root, "www", "full",
-                "ubuntu-touch", "ubuntu-rtm", "14.09", "daily-preinstalled"),
-            self.make_publisher(
-                "ubuntu-touch", "daily-preinstalled").publish_base)
 
     def test_size_limit(self):
         for project, dist, image_type, arch, size_limit in (
@@ -1743,14 +1727,6 @@ class TestDailyTreePublisher(TestCase):
                 "ubuntu-zh_CN", "daily-live", "desktop",
                 "i386"))
 
-    def test_qa_product_ubuntu_touch(self):
-        publisher = self.make_publisher("ubuntu-touch", "daily-preinstalled")
-        self.assertEqual(
-            ("Ubuntu Touch armhf", "iso"),
-            publisher.qa_product(
-                "ubuntu-touch", "daily-preinstalled", "preinstalled-touch",
-                "armhf"))
-
     def test_qa_product_ubuntu_preinstalled(self):
         publisher = self.make_publisher("ubuntu", "daily")
         self.assertEqual(
diff --git a/lib/cdimage/tree.py b/lib/cdimage/tree.py
index bdac6f8..8562fd1 100644
--- a/lib/cdimage/tree.py
+++ b/lib/cdimage/tree.py
@@ -44,7 +44,7 @@ from cdimage.checksums import (
     ChecksumFileSet,
     checksum_directory,
 )
-from cdimage.config import Series, Touch
+from cdimage.config import Series
 from cdimage.log import logger, reset_logging
 from cdimage.mirror import trigger_mirrors
 from cdimage import osextras
@@ -412,8 +412,6 @@ class Publisher:
         if self.image_type.endswith("-preinstalled"):
             if self.project == "ubuntu-server":
                 return "preinstalled-server"
-            elif self.project == "ubuntu-touch":
-                return "preinstalled-touch"
             elif self.project == "ubuntu-core":
                 return "preinstalled-core"
             else:
@@ -570,8 +568,6 @@ class Publisher:
             return "preinstalled netbook %s" % cd
         elif publish_type == "preinstalled-active":
             return "preview preinstalled active image"
-        elif publish_type == "preinstalled-touch":
-            return "preinstalled touch image"
         elif publish_type == "preinstalled-core":
             return "preinstalled core image"
         elif publish_type == "wubi":
@@ -764,10 +760,6 @@ class Publisher:
             sentences.append(
                 "The Active Image allows you to unpack a preinstalled preview "
                 "of the Plasma Active workspace onto an SD card.")
-        elif publish_type == "preinstalled-touch":
-            sentences.append(
-                "The Preinstalled Touch Image allows you to install a "
-                "preinstalled preview of Ubuntu Touch onto a target device.")
         elif publish_type.startswith("preinstalled-"):
             sentences.append(
                 "The %s %s allows you to unpack a preinstalled version of %s "
@@ -1137,34 +1129,6 @@ class Publisher:
         heading = heading.replace('-', ' ')
         return heading
 
-    def ubuntu_touch_legal_notice(self):
-        yield "<h3>Legal Notice</h3>"
-        yield Paragraph([
-            "Ubuntu Touch is released for free non-commercial use.",
-            "It is provided without warranty, even the implied warranty of "
-            "merchantability, satisfaction or fitness for a particular use.",
-            "See the licence included with each program for details.",
-        ])
-        yield Paragraph([
-            "Some licences may grant additional rights; this notice shall not "
-            "limit your rights under each program's licence.",
-            "Licences for each program are available in the /usr/share/doc "
-            "directory.",
-            "Source code for Ubuntu can be downloaded from %s." % Link(
-                "http://archive.ubuntu.com/", "archive.ubuntu.com"),
-            "Ubuntu, the Ubuntu logo and Canonical are registered trademarks "
-            "of Canonical Ltd.",
-            "All other trademarks are the property of their respective "
-            "owners.",
-        ])
-        yield Paragraph([
-            "Ubuntu Touch is released for limited use due to the inclusion of "
-            "binary hardware support files.",
-            "The original components and licenses can be found at: %s." % Link(
-                "https://developers.google.com/android/nexus/drivers",
-                "https://developers.google.com/android/nexus/drivers"),
-        ])
-
     def find_images(self, directory, prefix, publish_type):
         images = []
         prefix_type = "%s-%s" % (prefix, publish_type)
@@ -1216,7 +1180,7 @@ class Publisher:
             "preinstalled-desktop", "preinstalled-netbook",
             "preinstalled-mobile", "preinstalled-active",
             "preinstalled-server",
-            "preinstalled-touch", "preinstalled-core", "wubi",
+            "preinstalled-core", "wubi",
             "live-core",
             "live-core-desktop",
             "desktop-canary",
@@ -1727,11 +1691,6 @@ class Publisher:
             if got_iso or got_img:
                 print(file=header)
 
-            if self.config.project == "ubuntu-touch":
-                for tag in self.ubuntu_touch_legal_notice():
-                    print(tag, file=header)
-                print(file=header)
-
             print("<div class='p-table-wrapper'>", file=header)
 
             print(
@@ -2230,30 +2189,6 @@ class DailyTreePublisher(Publisher):
         else:
             osextras.unlink_force("%s.squashfs" % target_prefix)
 
-        # Flashable Android boot images
-        if os.path.exists("%s.bootimg" % source_prefix):
-            logger.info("Publishing %s abootimg images ..." % arch)
-            shutil.move(
-                "%s.bootimg" % source_prefix, "%s.bootimg" % target_prefix)
-
-        for touch_target in Touch.list_targets_by_ubuntu_arch(arch):
-            boot_img = "%s-preinstalled-boot-%s+%s.img" % (
-                self.config.series, touch_target.ubuntu_arch,
-                touch_target.subarch)
-            system_img = "%s-preinstalled-system-%s+%s.img" % (
-                self.config.series, touch_target.android_arch,
-                touch_target.subarch)
-            recovery_img = "%s-preinstalled-recovery-%s+%s.img" % (
-                self.config.series, touch_target.android_arch,
-                touch_target.subarch)
-
-            for image in boot_img, system_img, recovery_img:
-                if os.path.exists(os.path.join(source_dir, image)):
-                    logger.info("Publishing %s ..." % image)
-                    shutil.move(
-                        os.path.join(source_dir, image),
-                        os.path.join(target_dir, image))
-
         if os.path.exists("%s.custom.tar.gz" % source_prefix):
             logger.info("Publishing %s custom tarball ..." % arch)
             shutil.move(
@@ -2548,16 +2483,6 @@ class DailyTreePublisher(Publisher):
             for arch in arches:
                 if image_base.endswith("-%s" % arch):
                     matches = True
-                elif (self.config.project == "ubuntu-touch" and
-                      arch == "armhf" and
-                      ("-armel+" in image_base or "-armhf+" in image_base)):
-                    matches = True
-                elif (self.config.project == "ubuntu-touch" and
-                      arch == "i386" and "-i386+" in image_base):
-                    matches = True
-                elif (self.config.project == "ubuntu-touch" and
-                      arch == "arm64" and "-arm64+" in image_base):
-                    matches = True
                 elif self.config.subproject == "wubi" and image_base == arch:
                     matches = True
                 else: