Merge lp:~jibel/ubuntu-cdimage/support_for_multilayer into lp:ubuntu-cdimage

[Jean-Baptiste Lallement]

Adds support for multilayer images

* Made artefacts download generic: Don't hardcode artefact names and ensure they can be matched via regexp, on launchpad or local directory build.
* Fixed test suite
* Removed obsolete edubuntu server-squashfs test (LP: #1154601)
* Ensure we are still compatible with tests using a local server and with a local build.
* Add new ubuntu:canary subproject in automated builds

Extract from the discussion with cjwatson about these changes:
"""""
didrocks hey cjwatson! jibel and I have a question on ubuntu-cdimage: as with the new layered images we are building, we might not know in advance the squashfs, size, manifest files. We want to avoid to hardcode more filenames that already exists. In livefs.py, there are basically 2 code paths to download assets. One is using LP API (and so, can list all artefacts attached to a specific build) and the other
didrocks one is just for filesystem + http:// download. We thought to match against regexp, which works in the LP case and for filesystem (via os.listdir()). However, tests are failing as they are using http mock server. I wonder if in production, only the LP path is took. If so, can we just detect "http" for tests and either create a manifest that we download or rely on hardcoded filenames?
cjwatson As far as I know it's only ever the LP path in production, indeed
didrocks so, do you think special casing tests, like not using the regexp for them, is fine?
cjwatson Yeah, I think so
didrocks perfect! Thanks a lot cjwatson :)
cjwatson The http:// case may even be legacy - not sure
didrocks yeah, sounds like it, but we preferred asking you directly :)
cjwatson Obviously for good software engineering reasons keeping special cases for tests to a minimum is a good idea, but creating a sort of meta-manifest doesn't seem unreasonable, maybe with a fallback if it doesn't exist
didrocks yeah, the best would be ofc to rewrite the tests to mock LP
didrocks but I think that's out of our current scope :)
"""""

[Jean-Baptiste Lallement (jibel)]

Rebased on trunk, could you please review? Thanks

[lp:~jibel/ubuntu-cdimage/support_for_multilayer]

1772. By Adam Conrad on 2018-12-18

Update bionic to 18.04.2

1773. By Adam Conrad on 2018-12-18

Fix line-lengths in bin/daily-checks with more pleasant wrapping.

1774. By Adam Conrad on 2018-12-21

Drop i386 from default arches for "*" and "dvd", as lubuntu was the last: https://lists.ubuntu.com/archives/ubuntu-release/2018-December/004664.html

1775. By Steve Langasek on 2018-12-26

Merge lp:~vorlon/ubuntu-cdimage/lp.1731122

1776. By Steve Langasek on 2019-01-08

Merge lp:~sil2100/ubuntu-cdimage/add_raspi3

1777. By Steve Langasek on 2019-01-11

Merge lp:~sil2100/ubuntu-cdimage/latest-unique_key

1778. By Łukasz Zemczak on 2019-01-22

Enable raspi3 builds in default-arches since bionic+

1779. By Łukasz Zemczak on 2019-02-07

Add the pi3-arm64 variant to core18 images we're building.

1780. By Adam Conrad on 2019-02-14

Use server-ship-live on bionic as well.

1781. By Steve Langasek on 2019-02-14

Make make-web-indices work again for source ISO publication

1782. By Adam Conrad on 2019-02-19

Fix headers on ubuntu-core HTML pages.

1783. By Łukasz Zemczak on 2019-02-21

Update xenial to 16.04.6

1784. By Łukasz Zemczak on 2019-02-22

xenial: PROPOSED=0

1785. By Łukasz Zemczak on 2019-02-22

Switch ubuntu-gnome's seeds from bzr to git.

1786. By Steve Langasek on 2019-02-27

Merge lp:~xubuntu-dev/ubuntu-cdimage/bionic_image_size

1787. By Steve Langasek on 2019-02-27

Update test to match

1788. By Steve Langasek on 2019-02-27

Prune information about obsolete releases.

The code has never dropped support for any historic Ubuntu releases. After
30+ releases, this makes the code quite cumbersome, and we know we will
never be re-releasing images for any releases that have reached end-of-life.
Instead of leaving hard-to-read code everywhere, trim all references to
releases that have reached end of life; if someone needs the old stuff, they
can always consult the VCS history for reference.

As of today, supported releases means:
 - precise (still ESM supported)
 - trusty
 - xenial
 - bionic
 - cosmic
 - disco

older releases, and interim non-LTS releases, are dropped.

1789. By Steve Langasek on 2019-02-27

More pruning; this drops support for the historical 'winfoss' item, last
used by edubuntu in hardy.

1790. By Steve Langasek on 2019-02-27

More pruning; this drops the 'tocd3' and 'tocd3.1' projects, which are purely
historical (2005).

1791. By Steve Langasek on 2019-02-27

More pruning; includes dropping the 'umenu' downloadable, only used in hardy
and intrepid

1792. By Steve Langasek on 2019-02-27

Further pruning. Includes dropping the lpia arch, and the ubuntu-mid product
which was lpia-only.

1793. By Steve Langasek on 2019-02-27

Further pruning. Drops ubuntu-headless project, which was possibly never
released but is certainly obsolete since ~10.04.

1794. By Steve Langasek on 2019-02-27

Further pruning. Drops ubuntu-netbook project, obsolete since 11.04.

1795. By Steve Langasek on 2019-02-27

Further pruning; now pruned up to oneiric

1796. By Steve Langasek on 2019-02-28

Further pruning; includes dropping ubuntu-desktop-next, which was only built
from vivid to wily

1797. By Steve Langasek on 2019-02-28

Purge vivid; includes dropping ubuntu-touch-custom which was vivid-only

1798. By Steve Langasek on 2019-02-28

Prune wily (no-op), zesty, artful

1799. By Steve Langasek on 2019-02-28

drop ubuntu-pd, which was only for vivid

1800. By Steve Langasek on 2019-02-28

drop kubuntu-plasma5, which was utopic/vivid only

1801. By Steve Langasek on 2019-02-28

Drop jeos support, obsolete since intrepid

1802. By Steve Langasek on 2019-02-28

Drop moblin-remix, which stopped being built some time before 12.04

[Steve Langasek (vorlon)]

review: Needs Fixing

[lp:~jibel/ubuntu-cdimage/support_for_multilayer]

1803. By Jean-Baptiste Lallement on 2019-03-07

Merged support for multi-layer images

[Didier Roche-Tolomelli (didrocks)]

Thanks for the review!

We just rebased on your cleanup branch to avoid adapating tests and code that are going to be removed soon. All your comments should hopefully now be addressed :)

[lp:~jibel/ubuntu-cdimage/support_for_multilayer]

1804. By Jean-Baptiste Lallement on 2019-03-08

* Removed dead code
* Fixed PEP8 warning
* Updated tests to match the code removal and use the LP code path
* Added negative test to download from remote URL

1805. By Jean-Baptiste Lallement on 2019-03-11

Fixed linter errors

1806. By Jean-Baptiste Lallement on 2019-03-11

Factorized download_live_items_* tests and removed duplicated tests
Added test for filtering several artefacts by suffix
Added test for downloading several artefacts

1807. By Jean-Baptiste Lallement on 2019-03-12

Removed all the references to server-squashfs

Unmerged revisions

=== modified file 'bin/cron.daily'
--- bin/cron.daily	2015-10-26 11:06:11 +0000
+++ bin/cron.daily	2019-03-07 16:20:18 +0000
@@ -39,7 +39,7 @@
     series = config["DIST"]
     if project == "edubuntu":
         config["CDIMAGE_ADDON"] = "1"
-    elif (project == "ubuntu-server" and series >= "quantal" and
+    elif (project == "ubuntu-server" and series >= "trusty" and
           not config["CDIMAGE_NO_SQUASHFS_BASE"]):
         config["CDIMAGE_SQUASHFS_BASE"] = "1"
     if not build_image_set(config, options):
 
=== modified file 'bin/cron.dvd'
--- bin/cron.dvd	2015-10-26 11:06:11 +0000
+++ bin/cron.dvd	2019-03-07 16:20:18 +0000
@@ -35,22 +35,7 @@
     options, _ = parser.parse_args()
     config = Config(IMAGE_TYPE="dvd")
     project = config.project
-    series = config["DIST"]
-    if project == "edubuntu":
-        # Edubuntu lucid and onwards: DVD is live-only
-        if series <= "karmic":
-            config["CDIMAGE_INSTALL"] = "1"
-    elif project == "ubuntu":
-        # Ubuntu oneiric and onwards: DVD is live-only
-        if series <= "natty":
-            config["CDIMAGE_INSTALL"] = "1"
-    elif project == "ubuntustudio":
-        # Ubuntu Studio precise and onwards: DVD is live-only
-        # (Actually, it didn't exist before then anyway, but we check this
-        # just for documentation's sake.)
-        if series <= "oneiric":
-            config["CDIMAGE_INSTALL"] = "1"
-    else:
+    if project not in ("edubuntu", "ubuntu", "ubuntustudio"):
         config["CDIMAGE_INSTALL"] = "1"
     config["CDIMAGE_LIVE"] = "1"
     config["CDIMAGE_DVD"] = "1"
 
=== modified file 'bin/daily-checks'
--- bin/daily-checks	2018-12-18 19:27:24 +0000
+++ bin/daily-checks	2019-03-07 16:20:18 +0000
@@ -83,20 +83,10 @@
 def project_title(project):
     if project == 'ubuntu-server':
         return 'Ubuntu Server'
-    elif project == 'jeos':
-        return 'Ubuntu JeOS'
     elif project == 'ubuntustudio':
         return 'Ubuntu Studio'
-    elif project == 'ubuntu-netbook':
-        return 'Ubuntu Netbook'
-    elif project == 'ubuntu-headless':
-        return 'Ubuntu Headless'
     elif project == 'kubuntu-active':
         return 'Kubuntu Active'
-    elif project == 'kubuntu-plasma5':
-        return 'Kubuntu Plasma 5'
-    elif project == 'ubuntu-moblin-remix':
-        return 'Ubuntu Moblin Remix'
     else:
         return project.title()
 
@@ -237,17 +227,13 @@
 
     projects = (
         'ubuntu',
-        'ubuntu-desktop-next',
         'ubuntu-server',
         'kubuntu',
         'edubuntu',
         'xubuntu',
         'ubuntustudio',
-        'ubuntu-netbook',
         'kubuntu-netbook',
-        'ubuntu-moblin-remix',
         'kubuntu-active',
-        'kubuntu-plasma5',
         'mythbuntu',
         'lubuntu',
         'lubuntu-next',
 
=== modified file 'bin/find-live-filesystem'
--- bin/find-live-filesystem	2018-02-23 13:03:40 +0000
+++ bin/find-live-filesystem	2019-03-07 16:20:18 +0000
@@ -33,7 +33,7 @@
     parser = OptionParser(
         "%prog ARCH cloop|squashfs|kernel|kernel-efi-signed|initrd|bootimg|"
         "manifest|manifest-desktop|manifest-remove|manifest-minimal-remove|"
-        "disk1.img.xz|img.xz|size|winfoss|wubi|umenu|usb-creator|"
+        "disk1.img.xz|img.xz|size|wubi|usb-creator|"
         "ltsp-squashfs|ext2|ext3|ext4|rootfs.tar.gz|custom.tar.gz|"
         "device.tar.gz|tar.xz|iso")
     _, args = parser.parse_args()
 
=== modified file 'bin/make-metalink'
--- bin/make-metalink	2015-10-26 11:06:11 +0000
+++ bin/make-metalink	2019-03-07 16:20:18 +0000
@@ -32,7 +32,7 @@
     parser = OptionParser(
         "%prog DIRECTORY VERSION STATUS\n"
         " e.g.: %prog " + config.root +
-        "/www/full/daily-live/20130327 raring daily")
+        "/www/full/daily-live/20130327 bionic daily")
     _, args = parser.parse_args()
     if len(args) < 1:
         parser.error("need directory")
 
=== modified file 'bin/rebuild-requests'
--- bin/rebuild-requests	2018-10-30 13:23:58 +0000
+++ bin/rebuild-requests	2019-03-07 16:20:18 +0000
@@ -134,8 +134,7 @@
             env['SUBPROJECT'] = sub_project
 
         if (project == "ubuntu-touch" and
-                args[0] in ("vivid", "wily", "xenial", "yakkety", "zesty",
-                            "artful", "bionic", "cosmic", "disco")):
+                args[0] in ("xenial", "bionic", "cosmic", "disco")):
             env['EXTRA_PPAS'] = \
                 "ci-train-ppa-service/stable-phone-overlay:1001"
             env['PROPOSED'] = "0"
 
=== modified file 'etc/config'
--- etc/config	2019-03-01 15:42:09 +0000
+++ etc/config	2019-03-07 16:20:18 +0000
@@ -15,11 +15,6 @@
 PROJECT="${PROJECT:-ubuntu}"
 CAPPROJECT="${CAPPROJECT:-Ubuntu}"
 IMAGE_FORMAT=${IMAGE_FORMAT:-iso}
-case $PROJECT in
-	ubuntu-mid)
-		IMAGE_FORMAT=${IMAGE_FORMAT:-vfat}
-		;;
-esac
 export IMAGE_FORMAT
 DIST="${DIST:-disco}"
 
 
=== modified file 'etc/crontab'
--- etc/crontab	2018-10-30 13:23:58 +0000
+++ etc/crontab	2019-03-07 16:20:18 +0000
@@ -21,7 +21,7 @@
 20 15 * * *	DIST=bionic for-project ubuntu-budgie cron.daily-live --live
 26 2 * * *	DIST=bionic for-project ubuntu-mate cron.daily-live --live
 # regular disco daily builds
-31 7 * * *	for-project ubuntu cron.daily-live --live
+31 7 * * *	for-project ubuntu cron.daily-live --live; SUBPROJECT=canary for-project ubuntu cron.daily-live --live
 14 5 * * *	for-project kubuntu cron.daily-live --live
 50 1 * * *	for-project xubuntu cron.daily-live --live
 29 6 * * *	for-project ubuntu-server cron.daily --live; for-project ubuntu-server cron.daily-preinstalled --live; SUBPROJECT=live for-project ubuntu-server cron.daily-live --live
 
=== modified file 'etc/default-arches'
--- etc/default-arches	2019-02-07 15:42:49 +0000
+++ etc/default-arches	2019-03-07 16:20:18 +0000
@@ -3,69 +3,35 @@
 
 *			source			*			i386
 
-ubuntu-touch		daily-preinstalled	saucy			armhf
-ubuntu-touch		daily-preinstalled	trusty-wily			armhf i386
+ubuntu-touch		daily-preinstalled	trusty			armhf i386
 ubuntu-touch		daily-preinstalled	xenial-			armhf i386 arm64
-ubuntu-touch		daily-preinstalled	ubuntu-rtm/*		armhf i386
-
-ubuntu-touch-custom	daily-preinstalled	trusty-			armhf i386
-
-ubuntu			daily-preinstalled	oneiric			armel+ac100 armel+mx5 armel+omap armel+omap4
-ubuntu			daily-preinstalled	raring			armhf+nexus7
-lubuntu			daily-preinstalled	quantal-saucy		armhf+ac100
-
-*			daily-preinstalled	maverick-oneiric	armel+omap armel+omap4
-ubuntu-server		daily-preinstalled	quantal			armhf+omap4
-
-edubuntu		dvd			quantal-		amd64 i386
-edubuntu-dvd		dvd			quantal-		amd64 i386
-
-ubuntu-base		daily			oneiric			amd64 armel i386
+
+edubuntu		dvd			trusty-		amd64 i386
+edubuntu-dvd		dvd			trusty-		amd64 i386
+
 ubuntu-base		daily			precise			amd64 armhf i386
-ubuntu-base		daily			quantal-raring		amd64 armhf i386 powerpc
-ubuntu-base		daily			saucy			amd64 arm64 armhf i386 powerpc
-ubuntu-base		daily			trusty-wily		amd64 arm64 armhf i386 powerpc ppc64el
-ubuntu-base		daily			xenial-yakkety		amd64 arm64 armhf i386 powerpc ppc64el s390x
-ubuntu-base		daily			zesty-			amd64 arm64 armhf i386 ppc64el s390x
-ubuntu-core-system-image	daily-preinstalled	utopic		amd64 armhf i386
-ubuntu-core-system-image	daily-preinstalled	vivid-wily	amd64 arm64 armhf i386
+ubuntu-base		daily			trusty			amd64 arm64 armhf i386 powerpc ppc64el
+ubuntu-base		daily			xenial			amd64 arm64 armhf i386 powerpc ppc64el s390x
+ubuntu-base		daily			bionic-			amd64 arm64 armhf i386 ppc64el s390x
 ubuntu-core-system-image	daily-preinstalled	xenial-		amd64 arm64 armhf i386 ppc64el s390x
 ubuntu-core		daily-live		xenial-cosmic		amd64 arm64+snapdragon armhf+cm3 armhf+raspi2 armhf+raspi3 i386
 ubuntu-core		daily-live		disco-			amd64 arm64+snapdragon armhf+cm3 armhf+raspi2 armhf+raspi3 arm64+raspi3 i386
 
-jeos			*			*			i386
-
-kubuntu			daily-live		feisty-intrepid		amd64 i386 ia64 powerpc
-kubuntu			daily-live		jaunty			amd64 armel i386 ia64 powerpc
-kubuntu			daily-live		karmic			amd64 armel+dove armel+imx51 i386 ia64 powerpc
-kubuntu			daily-live		lucid			amd64 i386 ia64 powerpc
 kubuntu			daily-live		precise			amd64 i386
 kubuntu			daily-live		trusty			amd64 amd64+mac i386
-kubuntu			daily-live		utopic-bionic		amd64 i386
+kubuntu			daily-live		xenial-bionic		amd64 i386
 kubuntu			daily-live		cosmic-			amd64
 
 kubuntu-active		*			*			i386
 
-kubuntu-plasma5		daily-live		utopic-			amd64 i386
-
-mythbuntu		*			warty-edgy		amd64 i386 powerpc
 mythbuntu		*			*			amd64 i386
 
-ubuntu			daily			karmic			amd64 armel+dove armel+imx51 i386 ia64 lpia powerpc powerpc+ps3 sparc
 ubuntu			daily			precise			amd64 amd64+mac i386
 
-ubuntu			daily-live		feisty-intrepid		amd64 i386 ia64 powerpc powerpc+ps3
-ubuntu			daily-live		jaunty			amd64 armel i386 ia64 powerpc powerpc+ps3
-ubuntu			daily-live		karmic			amd64 armel+dove armel+imx51 i386 ia64 powerpc powerpc+ps3
-ubuntu			daily-live		lucid			amd64 i386 ia64 powerpc powerpc+ps3
 ubuntu			daily-live		precise			amd64 amd64+mac i386
-ubuntu			daily-live		quantal			amd64 amd64+mac armhf+omap4 i386 powerpc
-ubuntu			daily-live		raring-trusty		amd64 amd64+mac i386
-ubuntu			daily-live		utopic-zesty		amd64 i386
-ubuntu			daily-live		artful-			amd64
-
-ubuntu-desktop-next	*			-vivid			amd64 i386 armhf
-ubuntu-desktop-next-system-image	daily-preinstalled			wily-			amd64 i386 armhf
+ubuntu			daily-live		trusty			amd64 amd64+mac i386
+ubuntu			daily-live		xenial			amd64 i386
+ubuntu			daily-live		bionic-			amd64
 
 ubuntu-gnome		*			*			amd64 i386
 
@@ -75,65 +41,31 @@
 ubuntu-mate		*			-bionic			amd64 i386
 ubuntu-mate		*			cosmic-			amd64
 
-ubuntu-mid		*			*			lpia
-
-ubuntu-moblin-remix	*			*			i386
-
-ubuntu-netbook		daily-live		lucid			armel+imx51 armel+dove armel+omap i386
-ubuntu-netbook		daily-live		maverick		armel+dove i386
-
-ubuntu-server		daily-preinstalled	xenial-artful		armhf+raspi2
+ubuntu-server		daily-preinstalled	xenial			armhf+raspi2
 ubuntu-server		daily-preinstalled	bionic-			armhf+raspi2 armhf+raspi3 arm64+raspi3
-ubuntu-server		*			intrepid		amd64 hppa i386 ia64 powerpc powerpc+ps3 sparc
-ubuntu-server		*			jaunty			amd64 armel hppa i386 ia64 powerpc powerpc+ps3 sparc
-ubuntu-server		*			karmic-lucid		amd64 armel+dove armel+imx51 armel+omap i386 ia64 powerpc powerpc+ps3 sparc
-ubuntu-server		*			maverick		amd64 amd64+mac armel+dove armel+omap armel+omap4 i386 powerpc powerpc+ps3
-ubuntu-server		*			natty-oneiric		amd64 amd64+mac armel+dove armel+omap armel+omap4 i386 powerpc
 ubuntu-server		*			precise			amd64 i386
-ubuntu-server		*			quantal-saucy		amd64 amd64+mac armhf+omap armhf+omap4 i386 powerpc
 ubuntu-server		*			trusty			amd64 amd64+mac i386 powerpc ppc64el
-ubuntu-server		*			utopic-wily		amd64 i386 powerpc ppc64el
-ubuntu-server		*			xenial-yakkety		amd64 arm64 i386 powerpc ppc64el s390x
-ubuntu-server		*			zesty-artful		amd64 arm64 i386 ppc64el s390x
+ubuntu-server		*			xenial			amd64 arm64 i386 powerpc ppc64el s390x
 ubuntu-server		*			bionic-			amd64 arm64 ppc64el s390x
 
-ubuntu-server-live	*			artful-cosmic		amd64 arm64 ppc64el
+ubuntu-server-live	*			bionic-cosmic		amd64 arm64 ppc64el
 ubuntu-server-live	*			disco-			amd64 arm64 ppc64el s390x
 
 ubuntu-wubi		*			*			amd64 i386
 
-ubuntu-zh_CN		*			maverick-natty		i386
-ubuntu-zh_CN		*			oneiric-		amd64 i386
+ubuntu-zh_CN		*			precise-		amd64 i386
 ubuntukylin		*			-bionic			amd64 i386
 ubuntukylin		*			cosmic-			amd64
 
-ubuntustudio		*			warty-edgy		amd64 i386 powerpc
-ubuntustudio		*			feisty-bionic		amd64 i386
+ubuntustudio		*			precise-bionic		amd64 i386
 ubuntustudio		*			cosmic-			amd64
 
-xubuntu			daily-live		jaunty			armel powerpc powerpc+ps3
-xubuntu			daily-live		karmic			armel+dove armel+imx51 powerpc powerpc+ps3
-
-xubuntu			*			feisty-maverick		amd64 i386 powerpc powerpc+ps3
-xubuntu			*			natty-cosmic		amd64 i386
+xubuntu			*			precise-cosmic		amd64 i386
 xubuntu			*			disco-			amd64
 
-*			daily-live		gutsy-intrepid		amd64 i386 ia64 powerpc powerpc+ps3 sparc
-*			daily-live		jaunty			amd64 armel i386 ia64 powerpc powerpc+ps3 sparc
-*			daily-live		karmic			amd64 i386 ia64 powerpc powerpc+ps3 sparc
-
-*			dvd			warty-edgy		amd64 i386 powerpc
-*			dvd			feisty-cosmic		amd64 i386
+*			dvd			precise-cosmic		amd64 i386
 *			dvd			*			amd64
 
-*			*			warty-dapper		amd64 hppa i386 ia64 powerpc sparc
-*			*			edgy			amd64 i386 ia64 powerpc sparc
-*			*			feisty			amd64 i386 ia64 powerpc powerpc+ps3 sparc
-*			*			gutsy-hardy		amd64 hppa i386 ia64 powerpc powerpc+ps3 sparc
-*			*			intrepid-jaunty		amd64 hppa i386 ia64 lpia powerpc powerpc+ps3 sparc
-*			*			karmic			amd64 i386 ia64 lpia powerpc powerpc+ps3 sparc
-*			*			lucid			amd64 i386 ia64 powerpc powerpc+ps3 sparc
-*			*			maverick		amd64 amd64+mac i386 powerpc powerpc+ps3
-*			*			natty-trusty		amd64 amd64+mac i386 powerpc
-*			*			utopic-cosmic		amd64 i386
+*			*			precise-trusty		amd64 amd64+mac i386 powerpc
+*			*			xenial-cosmic		amd64 i386
 *			*			*			amd64
 
=== modified file 'etc/livefs-launchpad'
--- etc/livefs-launchpad	2017-05-16 16:10:49 +0000
+++ etc/livefs-launchpad	2019-03-07 16:20:18 +0000
@@ -3,15 +3,13 @@
 # Like etc/default-arches, "PROJECT" is in fact PROJECT[-SUBPROJECT][-LOCALE].
 
 ubuntu			daily-live		*		*		ubuntu-cdimage/ubuntu
-ubuntu-desktop-next	daily-live		-vivid		*		ubuntu-cdimage/ubuntu-desktop-next
-ubuntu-desktop-next-system-image	daily-preinstalled	wily-	*	ubuntu-cdimage/ubuntu-desktop-next
+ubuntu-canary			daily-live		*		*		ubuntu-cdimage/ubuntu-canary
 kubuntu			daily-live		*		*		ubuntu-cdimage/kubuntu
-kubuntu-plasma5		daily-live		*		*		ubuntu-cdimage/kubuntu-plasma5
 edubuntu		dvd			*		*		ubuntu-cdimage/edubuntu
 xubuntu			daily-live		*		*		ubuntu-cdimage/xubuntu
-ubuntu-server		daily			quantal-	*		ubuntu-cdimage/ubuntu-server
+ubuntu-server		daily			trusty-		*		ubuntu-cdimage/ubuntu-server
 ubuntu-server		daily-preinstalled	xenial-		*		ubuntu-cdimage/cpc
-ubuntu-server-live	daily-live		zesty-		*		ubuntu-cdimage/ubuntu-server-live
+ubuntu-server-live	daily-live		bionic-		*		ubuntu-cdimage/ubuntu-server-live
 ubuntustudio		dvd			*		*		ubuntu-cdimage/ubuntustudio
 mythbuntu		daily-live		*		*		ubuntu-cdimage/mythbuntu
 lubuntu-next		daily-live		*		*		ubuntu-cdimage/lubuntu-next
@@ -27,8 +25,6 @@
 ubuntu-budgie		daily-live		*		*		ubuntu-cdimage/ubuntu-budgie
 ubuntu-touch		daily-preinstalled	ubuntu-rtm/*	*		ubuntu-cdimage/ubuntu-touch
 ubuntu-touch		daily-preinstalled	trusty-		*		ubuntu-cdimage/ubuntu-touch
-ubuntu-touch-custom	daily-preinstalled	vivid-		*		ubuntu-cdimage/ubuntu-touch-custom
-ubuntu-pd		daily-preinstalled	*		*		ubuntu-cdimage/ubuntu-pd
 ubuntu			dvd			-precise	*		ubuntu-cdimage/ubuntu-dvd
 ubuntu-wubi		wubi			*		*		ubuntu-cdimage/ubuntu-wubi
-ubuntu-zh_CN		daily-live		-raring		*		ubuntu-cdimage/ubuntu-zh-cn
+ubuntu-zh_CN		daily-live		-precise	*		ubuntu-cdimage/ubuntu-zh-cn
 
=== modified file 'etc/purge-days'
--- etc/purge-days	2018-10-26 11:55:31 +0000
+++ etc/purge-days	2019-03-07 16:20:18 +0000
@@ -3,14 +3,15 @@
 daily-preinstalled 1
 # Purge images older than 2 days => keep the most recent build.
 dvd 2
+<<<<<<< TREE
 # Only purge TheOpenCDv3 images manually.
 tocd3/daily-live 0
 # Ubuntu Core images are not purged per age
+=======
+# Only purge ubuntu-core images manually.
+>>>>>>> MERGE-SOURCE
 ubuntu-core 0
-ubuntu-mid 3
-ubuntu-netbook 3
 ubuntu-touch 7
-ubuntu-touch-custom 7
 source 1
 wubi 1
 ubuntu-zh_CN 3
 
=== modified file 'etc/qa-products'
--- etc/qa-products	2018-11-28 15:52:36 +0000
+++ etc/qa-products	2019-03-07 16:20:18 +0000
@@ -11,8 +11,6 @@
 Kubuntu Desktop armhf+omap4					kubuntu			daily-live			desktop					armhf+omap4		iso
 Kubuntu Desktop i386						kubuntu			daily-live			desktop					i386			iso
 Kubuntu Desktop powerpc						kubuntu			daily-live			desktop					powerpc			iso
-Kubuntu Plasma 5 Desktop amd64				kubuntu-plasma5		daily-live			desktop					amd64			iso
-Kubuntu Plasma 5 Desktop i386				kubuntu-plasma5		daily-live			desktop					i386			iso
 
 # Lubuntu
 Lubuntu Alternate amd64						lubuntu			daily				alternate				amd64			iso
@@ -47,17 +45,13 @@
 
 # Ubuntu Desktop 
 Ubuntu Desktop amd64						ubuntu			daily-live			desktop					amd64			iso
+Ubuntu Desktop (Canary) amd64				ubuntu			daily-live/canary	desktop					amd64			iso
 Ubuntu Desktop amd64+mac					ubuntu			daily-live			desktop					amd64+mac		iso
 Ubuntu Desktop armhf+omap4					ubuntu			daily-live			desktop					armhf+omap4		iso
 Ubuntu Desktop i386							ubuntu			daily-live			desktop					i386			iso
 Ubuntu Desktop powerpc						ubuntu			daily-live			desktop					powerpc			iso
 Ubuntu Desktop Preinstalled armhf+nexus7	ubuntu			daily-preinstalled	preinstalled-desktop	armhf+nexus7	iso
 
-# Ubuntu Desktop Next
-Ubuntu Desktop (Unity 8) armhf					ubuntu-desktop-next/system-image	daily-preinstalled	preinstalled-desktop-next		armhf			iso
-Ubuntu Desktop (Unity 8) amd64					ubuntu-desktop-next/system-image	daily-preinstalled	preinstalled-desktop-next		amd64			iso
-Ubuntu Desktop (Unity 8) i386					ubuntu-desktop-next/system-image	daily-preinstalled	preinstalled-desktop-next		i386			iso
-
 # Ubuntu GNOME
 Ubuntu GNOME Desktop amd64					ubuntu-gnome	daily-live			desktop					amd64			iso
 Ubuntu GNOME Desktop i386					ubuntu-gnome	daily-live			desktop					i386			iso
@@ -97,10 +91,6 @@
 Ubuntu Touch armhf							ubuntu-touch	daily-preinstalled	preinstalled-touch		armhf			iso
 Ubuntu Touch i386							ubuntu-touch	daily-preinstalled	preinstalled-touch		i386			iso
 
-# Ubuntu Touch Custom
-Ubuntu Touch Custom armhf					ubuntu-touch-custom	daily-preinstalled	preinstalled-touch	armhf			iso
-Ubuntu Touch Custom i386					ubuntu-touch-custom	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
 
=== modified file 'lib/cdimage/build.py'
--- lib/cdimage/build.py	2018-01-09 01:47:28 +0000
+++ lib/cdimage/build.py	2019-03-07 16:20:18 +0000
@@ -80,17 +80,14 @@
     if project == "gobuntu":
         config["CDIMAGE_ONLYFREE"] = "1"
     elif project == "edubuntu":
-        if series >= "karmic":
-            config["CDIMAGE_UNSUPPORTED"] = "1"
+        config["CDIMAGE_UNSUPPORTED"] = "1"
     elif project == "xubuntu":
-        if series >= "hardy":
-            config["CDIMAGE_UNSUPPORTED"] = "1"
+        config["CDIMAGE_UNSUPPORTED"] = "1"
     elif project == "kubuntu":
-        if series >= "quantal":
+        if series >= "trusty":
             config["CDIMAGE_UNSUPPORTED"] = "1"
     elif project in (
         "kubuntu-active",
-        "kubuntu-plasma5",
         "ubuntustudio",
         "mythbuntu",
         "lubuntu",
@@ -98,8 +95,6 @@
         "ubuntu-gnome",
         "ubuntu-budgie",
         "ubuntu-mate",
-        "ubuntu-moblin-remix",
-        "ubuntu-mid",
     ):
         config["CDIMAGE_UNSUPPORTED"] = "1"
 
@@ -363,66 +358,23 @@
             "UBUNTU_DEFAULTS_LOCALE='%s' not currently supported!" % locale)
 
     series = config["DIST"]
-    if series < "oneiric":
-        # Original hack: repack an existing image.
-        iso = config["ISO"]
-        if not iso:
-            raise Exception(
-                "Pass ISO=<path to Ubuntu image> in the environment.")
-
-        scratch = os.path.join(
-            config.root, "scratch", "ubuntu-chinese-edition", series.name)
-        bsdtar_tree = os.path.join(scratch, "bsdtar-tree")
-
-        log_marker("Unpacking")
-        if os.path.isdir(bsdtar_tree):
-            subprocess.check_call(["chmod", "-R", "+w", bsdtar_tree])
-        osextras.mkemptydir(bsdtar_tree)
-        subprocess.check_call(["bsdtar", "-xf", iso, "-C", bsdtar_tree])
-        subprocess.check_call(["chmod", "-R", "+w", bsdtar_tree])
-
-        log_marker("Transforming (robots in disguise)")
-        with open(os.path.join(bsdtar_tree, "isolinux", "lang"), "w") as lang:
-            print(locale, file=lang)
-        subprocess.call([
-            "mkisofs",
-            "-r", "-V", "Ubuntu Chinese %s i386" % series.version,
-            "-o", os.path.join(scratch, os.path.basename(iso)),
-            "-cache-inodes", "-J", "-l",
-            "-b", "isolinux/isolinux.bin", "-c", "isolinux/boot.cat",
-            "-no-emul-boot", "-boot-load-size", "4", "-boot-info-table",
-            bsdtar_tree,
-        ])
-
-        iso_prefix = iso.rsplit(".", 1)[0]
-        scratch_prefix = os.path.join(
-            scratch, os.path.basename(iso).rsplit(".", 1)[0])
-
-        for ext in "list", "manifest":
-            if os.path.exists("%s.%s" % (iso_prefix, ext)):
-                shutil.copy2(
-                    "%s.%s" % (iso_prefix, ext),
-                    "%s.%s" % (scratch_prefix, ext))
-            else:
-                osextras.unlink_force("%s.%s" % (scratch_prefix, ext))
-    else:
-        log_marker("Downloading live filesystem images")
-        download_live_filesystems(config)
-        scratch = live_output_directory(config)
-        for entry in os.listdir(scratch):
-            if "." in entry:
-                os.rename(
-                    os.path.join(scratch, entry),
-                    os.path.join(scratch, "%s-desktop-%s" % (series, entry)))
-        pi_makelist = os.path.join(
-            config.root, "debian-cd", "tools", "pi-makelist")
-        for entry in os.listdir(scratch):
-            if entry.endswith(".iso"):
-                entry_path = os.path.join(scratch, entry)
-                list_path = "%s.list" % entry_path.rsplit(".", 1)[0]
-                with open(list_path, "w") as list_file:
-                    subprocess.check_call(
-                        [pi_makelist, entry_path], stdout=list_file)
+    log_marker("Downloading live filesystem images")
+    download_live_filesystems(config)
+    scratch = live_output_directory(config)
+    for entry in os.listdir(scratch):
+        if "." in entry:
+            os.rename(
+                os.path.join(scratch, entry),
+                os.path.join(scratch, "%s-desktop-%s" % (series, entry)))
+    pi_makelist = os.path.join(
+        config.root, "debian-cd", "tools", "pi-makelist")
+    for entry in os.listdir(scratch):
+        if entry.endswith(".iso"):
+            entry_path = os.path.join(scratch, entry)
+            list_path = "%s.list" % entry_path.rsplit(".", 1)[0]
+            with open(list_path, "w") as list_file:
+                subprocess.check_call(
+                    [pi_makelist, entry_path], stdout=list_file)
 
 
 def add_android_support(config, arch, output_dir):
@@ -506,9 +458,8 @@
                 "%s.model-assertion" % live_prefix,
                 "%s.model-assertion" % output_prefix)
 
-    if (config.project in ("ubuntu-base", "ubuntu-touch",
-                           "ubuntu-touch-custom") or
-        (config.project in ("ubuntu-desktop-next", "ubuntu-core") and
+    if (config.project in ("ubuntu-base", "ubuntu-touch") or
+        (config.project == "ubuntu-core" and
          config.subproject == "system-image")):
         log_marker("Copying images to debian-cd output directory")
         scratch_dir = os.path.join(
@@ -528,26 +479,16 @@
                 elif config.project == "ubuntu-base":
                     output_prefix = os.path.join(
                         output_dir, "%s-base-%s" % (config.series, arch))
-                elif config.project in ("ubuntu-touch", "ubuntu-touch-custom"):
+                elif config.project == "ubuntu-touch":
                     output_prefix = os.path.join(
                         output_dir,
                         "%s-preinstalled-touch-%s" % (config.series, arch))
-                elif config.project == "ubuntu-desktop-next":
-                    if config.image_type == "daily-preinstalled":
-                        output_prefix = os.path.join(
-                            output_dir,
-                            "%s-preinstalled-desktop-next-%s" %
-                            (config.series, arch))
-                    else:
-                        output_prefix = os.path.join(
-                            output_dir, "%s-desktop-next-%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 in ("ubuntu-touch", "ubuntu-touch-custom"):
+                if config.project == "ubuntu-touch":
                     osextras.link_force(
                         "%s.raw" % output_prefix, "%s.tar.gz" % output_prefix)
                     add_android_support(config, arch, output_dir)
@@ -555,7 +496,7 @@
                     if os.path.exists(custom):
                         shutil.copy2(
                             custom, "%s.custom.tar.gz" % output_prefix)
-                if config.project in ("ubuntu-core", "ubuntu-desktop-next"):
+                if config.project == "ubuntu-core":
                     for dev in ("azure.device", "device", "raspi2.device",
                                 "plano.device"):
                         device = "%s.%s.tar.gz" % (live_prefix, dev)
@@ -571,10 +512,7 @@
 
 
 def _debootstrap_script(config):
-    if config["DIST"] <= "gutsy":
-        return "usr/lib/debootstrap/scripts/%s" % config.series
-    else:
-        return "usr/share/debootstrap/scripts/%s" % config.series
+    return "usr/share/debootstrap/scripts/%s" % config.series
 
 
 def extract_debootstrap(config):
@@ -710,15 +648,11 @@
 def is_live_fs_only(config):
     live_fs_only = False
     if config.project in (
-            "livecd-base", "ubuntu-base", "ubuntu-core", "ubuntu-touch",
-            "ubuntu-touch-custom"):
+            "livecd-base", "ubuntu-base", "ubuntu-core", "ubuntu-touch"):
         live_fs_only = True
     elif (config.project == "ubuntu-server" and
           config.image_type == "daily-preinstalled"):
         live_fs_only = True
-    elif (config.project == "ubuntu-desktop-next" and
-          config.subproject == "system-image"):
-        live_fs_only = True
     elif config.subproject == "wubi":
         live_fs_only = True
     return live_fs_only
 
=== modified file 'lib/cdimage/germinate.py'
--- lib/cdimage/germinate.py	2019-02-22 10:32:26 +0000
+++ lib/cdimage/germinate.py	2019-03-07 16:20:18 +0000
@@ -72,20 +72,14 @@
             gitpattern = "https://git.launchpad.net/~%s/ubuntu-seeds/+git/"
             series = self.config["DIST"]
             sources = [gitpattern % "ubuntu-core-dev"]
-            if project in ("kubuntu", "kubuntu-active", "kubuntu-plasma5"):
-                if series >= "oneiric":
-                    sources.insert(0, bzrpattern % "kubuntu-dev")
-                else:
-                    sources.insert(0, bzrpattern % "ubuntu-core-dev")
+            if project in ("kubuntu", "kubuntu-active"):
+                sources.insert(0, bzrpattern % "kubuntu-dev")
             elif project == "ubuntustudio":
                 sources.insert(0, gitpattern % "ubuntustudio-dev")
             elif project == "mythbuntu":
                 sources.insert(0, bzrpattern % "mythbuntu-dev")
             elif project == "xubuntu":
-                if series >= "intrepid":
-                    sources.insert(0, gitpattern % "xubuntu-dev")
-                else:
-                    sources.insert(0, bzrpattern % "ubuntu-core-dev")
+                sources.insert(0, gitpattern % "xubuntu-dev")
             elif project in ("lubuntu", "lubuntu-next"):
                 sources.insert(0, gitpattern % "lubuntu-dev")
             elif project == "ubuntu-gnome":
@@ -94,10 +88,8 @@
                 sources.insert(0, bzrpattern % "ubuntubudgie-dev")
             elif project == "ubuntu-mate":
                 sources.insert(0, bzrpattern % "ubuntu-mate-dev")
-            elif project == "ubuntu-moblin-remix":
-                sources.insert(0, bzrpattern % "moblin")
             elif project == "ubuntukylin":
-                if series >= "utopic":
+                if series >= "xenial":
                     sources.insert(0, gitpattern % "ubuntukylin-members")
                 else:
                     sources.insert(0, bzrpattern % "ubuntu-core-dev")
@@ -138,24 +130,13 @@
             return [pattern % self.config.series for pattern in dist_patterns]
 
     def seed_dist(self, project):
-        if (project in ("ubuntu-server", "jeos") and
-                self.config.series != "breezy"):
+        if project == "ubuntu-server":
             return "ubuntu.%s" % self.config.series
         elif project == "ubuntukylin":
-            if self.config["DIST"] >= "utopic":
+            if self.config["DIST"] >= "xenial":
                 return "ubuntukylin.%s" % self.config.series
             else:
                 return "ubuntu.%s" % self.config.series
-        elif project == "ubuntu-mid":
-            return "mobile.%s" % self.config.series
-        elif project == "ubuntu-netbook":
-            return "netbook.%s" % self.config.series
-        elif project == "ubuntu-headless":
-            return "ubuntu.%s" % self.config.series
-        elif project == "ubuntu-moblin-remix":
-            return "moblin.%s" % self.config.series
-        elif project == "ubuntu-desktop-next":
-            return "ubuntu-touch.%s" % self.config.series
         elif project == "lubuntu-next":
             return "lubuntu.%s" % self.config.series
         else:
@@ -218,24 +199,6 @@
         shutil.copy2(
             os.path.join(arch_output_dir, "structure"), output_structure)
 
-        if self.config.series == "breezy":
-            # Unfortunately, we now need a second germinate run to figure
-            # out the dependencies of language packs and the like.
-            extras = []
-            with open(os.path.join(
-                    arch_output_dir, "ship.acsets"), "w") as ship_acsets:
-                output = GerminateOutput(self.config, output_structure)
-                for pkg in output.seed_packages(arch, "ship.seed"):
-                    extras.append("desktop/%s" % pkg)
-                    print(pkg, file=ship_acsets)
-            if extras:
-                logger.info(
-                    "Re-germinating for %s/%s language pack dependencies ..." %
-                    (self.config.series, arch))
-                command.extend(["--seed-packages", ",".join(extras)])
-                proxy_check_call(
-                    self.config, "germinate", command, cwd=arch_output_dir)
-
     def germinate_project(self, project):
         osextras.mkemptydir(self.output_dir(project))
 
@@ -314,17 +277,10 @@
                 ship = "ship-addon"
             in_squashfs = None
             if project == "ubuntu-server":
-                if series <= "breezy":
-                    pass
-                elif series <= "dapper":
-                    ship = "server"
-                else:
-                    ship = "server-ship"
+                ship = "server-ship"
                 in_squashfs = ["minimal"]
             elif project == "kubuntu-active":
                 ship = "active-ship"
-            elif project == "jeos":
-                ship = "jeos"
             seeds = self._inheritance(ship)
             if (self.config["CDIMAGE_SQUASHFS_BASE"] and
                     in_squashfs is not None):
@@ -333,55 +289,33 @@
             for seed in seeds:
                 yield seed
             if self.config["CDIMAGE_DVD"]:
-                if series >= "edgy":
-                    # TODO cjwatson 2007-04-18: hideous hack to fix DVD tasks
-                    yield "dns-server"
-                    yield "lamp-server"
+                # TODO cjwatson 2007-04-18: hideous hack to fix DVD tasks
+                yield "dns-server"
+                yield "lamp-server"
         elif mode == "installer":
             if self.config["CDIMAGE_INSTALL_BASE"]:
                 yield "installer"
-            if self.config["CDIMAGE_LIVE"]:
-                if series >= "hoary" and series <= "breezy":
-                    yield "casper"
         elif mode == "debootstrap":
-            if series <= "hoary":
-                yield "base"
-            elif series <= "feisty":
-                yield "minimal"
-            else:
-                yield "required"
-                yield "minimal"
+            yield "required"
+            yield "minimal"
         elif mode == "base":
-            if series <= "hoary":
-                yield "base"
-            elif series <= "breezy":
-                yield "minimal"
-                yield "standard"
-            elif series <= "feisty":
-                yield "boot"
-                yield "minimal"
-                yield "standard"
-            else:
-                yield "boot"
-                yield "required"
-                yield "minimal"
-                yield "standard"
+            yield "boot"
+            yield "required"
+            yield "minimal"
+            yield "standard"
         elif mode == "ship-live":
             if project == "kubuntu-active":
                 yield "ship-active-live"
-            elif (project == "lubuntu" and series >= "artful"
-                  and series <= "bionic"):
+            elif project == "lubuntu" and series == "bionic":
                 yield "ship-live-gtk"
                 yield "ship-live-share"
-            elif (project == "lubuntu-next" and series >= "artful"
-                  and series <= "bionic"):
+            elif project == "lubuntu-next" and series == "bionic":
                 yield "ship-live-qt"
                 yield "ship-live-share"
             elif project == "ubuntu-server" and series >= "bionic":
                 yield "server-ship-live"
             else:
-                if series >= "dapper":
-                    yield "ship-live"
+                yield "ship-live"
         elif mode == "addon":
             ship = self._inheritance("ship")
             ship_addon = self._inheritance("ship-addon")
@@ -389,29 +323,22 @@
                 if seed not in ship:
                     yield seed
         elif mode == "dvd":
-            if series <= "gutsy":
-                for seed in self._inheritance("supported"):
-                    yield seed
-            elif series <= "karmic":
+            if project == "edubuntu":
+                # no inheritance; most of this goes on the live filesystem
+                yield "dvd"
+                yield "ship-live"
+            elif project == "ubuntu":
+                # no inheritance; most of this goes on the live filesystem
+                yield "usb-langsupport"
+                yield "usb-ship-live"
+            elif project == "ubuntustudio":
+                # no inheritance; most of this goes on the live filesystem
+                yield "dvd"
+                if series >= "bionic":
+                    yield "ship-live"
+            else:
                 for seed in self._inheritance("dvd"):
                     yield seed
-            else:
-                if project == "edubuntu":
-                    # no inheritance; most of this goes on the live filesystem
-                    yield "dvd"
-                    yield "ship-live"
-                elif project == "ubuntu" and series >= "oneiric":
-                    # no inheritance; most of this goes on the live filesystem
-                    yield "usb-langsupport"
-                    yield "usb-ship-live"
-                elif project == "ubuntustudio" and series >= "precise":
-                    # no inheritance; most of this goes on the live filesystem
-                    yield "dvd"
-                    if series >= "artful":
-                        yield "ship-live"
-                else:
-                    for seed in self._inheritance("dvd"):
-                        yield seed
 
     def seed_path(self, arch, seed):
         return os.path.join(self.directory, arch, seed)
@@ -492,24 +419,6 @@
                 if package == "bootstrap-base":
                     package = "live-installer"
 
-            # germinate doesn't yet support subarchitecture specifications
-            # (and it's not entirely clear what they would mean if it did),
-            # so we need to hack the boot and installer seeds a bit for
-            # powerpc+ps3 (only gutsy).
-            if self.config.series == "gutsy" and arch == "powerpc+ps3":
-                if seed in installer_seeds:
-                    if "-powerpc-di" in package:
-                        continue
-                    package = package.replace("-powerpc64-smp-di", "-cell-di")
-                if seed == "boot":
-                    if package.startswith("linux-restricted-modules"):
-                        continue
-                    if package.startswith("linux-ubuntu-modules"):
-                        continue
-                    if package.endswith("-powerpc"):
-                        continue
-                    package = package.replace("-powerpc64-smp", "-cell")
-
             # For precise, some flavours use a different kernel on i386.
             # germinate doesn't currently support this without duplicating
             # the entire boot and installer seeds, so we hack them instead.
@@ -523,7 +432,7 @@
             yield package
 
     def installer_initrds(self, cpuarch):
-        if cpuarch in ("amd64", "i386", "lpia"):
+        if cpuarch in ("amd64", "i386"):
             return ["cdrom/initrd.gz", "netboot/netboot.tar.gz"]
         elif cpuarch == "hppa":
             return ["cdrom/2.6/initrd.gz", "netboot/2.6/boot.img"]
@@ -567,16 +476,15 @@
 
     def common_initrd_packages(self, arch):
         initrd_packages_sets = []
-        if self.config["DIST"] >= "jaunty":
-            # Remove installer packages that are in both the cdrom and
-            # netboot initrds; there's no point duplicating these.
-            cpuarch = arch.split("+")[0]
-            initrds = self.installer_initrds(cpuarch)
-            subarches = self.installer_subarches(cpuarch)
-            for initrd in initrds:
-                for subarch in subarches:
-                    initrd_packages_sets.append(self.initrd_packages(
-                        "%s/%s" % (subarch, initrd), cpuarch))
+        # Remove installer packages that are in both the cdrom and
+        # netboot initrds; there's no point duplicating these.
+        cpuarch = arch.split("+")[0]
+        initrds = self.installer_initrds(cpuarch)
+        subarches = self.installer_subarches(cpuarch)
+        for initrd in initrds:
+            for subarch in subarches:
+                initrd_packages_sets.append(self.initrd_packages(
+                    "%s/%s" % (subarch, initrd), cpuarch))
         if initrd_packages_sets:
             return set.intersection(*initrd_packages_sets)
         else:
@@ -584,7 +492,7 @@
 
     def task_project(self, project):
         # ubuntu-server really wants ubuntu-* tasks.
-        if project in ("ubuntu-server", "jeos"):
+        if project == "ubuntu-server":
             return "ubuntu"
         else:
             return project
@@ -607,55 +515,24 @@
         return headers
 
     def seed_task_mapping(self, project, arch):
-        series = self.config["DIST"]
         task_project = self.task_project(project)
         for seed in self.list_seeds("all"):
-            if series <= "dapper":
-                # Tasks implemented by hand.
-                if seed in ("boot", "required", "server-ship"):
-                    continue
-                elif seed == "server" and project != "edubuntu":
-                    continue
-                elif seed == "ship" and series >= "dapper":
-                    continue
-
-                if seed in (
-                    "base", "minimal", "standard", "desktop", "server", "ship",
-                ):
-                    task = "%s-%s" % (task_project, seed)
-                else:
-                    task = seed
-                input_seeds = [seed]
-            elif series <= "gutsy":
-                # Tasks implemented via tasksel, but without Task-Seeds;
-                # hacks required for seed/task mapping.
-                if seed == "required":
-                    task = "minimal"
-                else:
-                    task = seed
-                headers = self.task_headers(arch, seed)
-                if not headers:
-                    continue
-                if "per-derivative" in headers:
+            # Tasks implemented via tasksel, with Task-Seeds to indicate
+            # task/seed mapping.
+            task = seed
+            headers = self.task_headers(arch, seed)
+            if not headers:
+                continue
+            input_seeds = [seed] + headers.get("seeds", "").split()
+            if "per-derivative" in headers:
+                # Edubuntu is odd; it's structured as an add-on to
+                # Ubuntu, so sometimes we need to create ubuntu-* tasks.
+                # At the moment I don't see a better approach than
+                # hardcoding the task names.
+                if project == "edubuntu" and task in ("desktop", "live"):
+                    task = "ubuntu-%s" % task
+                else:
                     task = "%s-%s" % (task_project, task)
-                input_seeds = [seed]
-            else:
-                # Tasks implemented via tasksel, with Task-Seeds to indicate
-                # task/seed mapping.
-                task = seed
-                headers = self.task_headers(arch, seed)
-                if not headers:
-                    continue
-                input_seeds = [seed] + headers.get("seeds", "").split()
-                if "per-derivative" in headers:
-                    # Edubuntu is odd; it's structured as an add-on to
-                    # Ubuntu, so sometimes we need to create ubuntu-* tasks.
-                    # At the moment I don't see a better approach than
-                    # hardcoding the task names.
-                    if project == "edubuntu" and task in ("desktop", "live"):
-                        task = "ubuntu-%s" % task
-                    else:
-                        task = "%s-%s" % (task_project, task)
 
             yield input_seeds, task
 
@@ -664,7 +541,6 @@
             master_project = "source"
         else:
             master_project = project
-        series = self.config["DIST"]
         output_dir = self.tasks_output_dir(master_project)
         osextras.ensuredir(output_dir)
 
@@ -706,27 +582,6 @@
                     print(
                         "%s  Task  %s" % (pkg, ", ".join(tasknames)),
                         file=override)
-            if series == "breezy":
-                # In breezy, also generate Archive-Copier-Set headers for
-                # sets of packages that archive-copier needs to know to copy
-                # but that shouldn't appear as tasks in aptitude et al.
-                ship_acsets_path = self.seed_path(arch, "ship.acsets")
-                all_acsets = defaultdict(list)
-                try:
-                    with open(ship_acsets_path) as ship_acsets:
-                        for acset in ship_acsets:
-                            acset = acset.rstrip("\n")
-                            for package in self.seed_packages(arch, acset):
-                                all_acsets[package].append(acset)
-                except IOError as e:
-                    if e.errno != errno.ENOENT:
-                        raise
-                for pkg, acsetnames in sorted(all_acsets.items()):
-                    print(
-                        "%s  Archive-Copier-Set  %s" % (
-                            pkg, ", ".join(acsetnames)),
-                        file=override)
-
             # Help debian-cd to get priorities in sync with the current base
             # system, so that debootstrap >= 0.3.1 can work out the correct
             # set of packages to install.
 
=== modified file 'lib/cdimage/livefs.py'
--- lib/cdimage/livefs.py	2018-12-12 20:29:20 +0000
+++ lib/cdimage/livefs.py	2019-03-07 16:20:18 +0000
@@ -34,7 +34,7 @@
     from urllib2 import URLError, unquote, urlopen
 
 from cdimage import osextras, sign
-from cdimage.config import Series, Touch
+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
@@ -121,14 +121,11 @@
         elif subarch in ("ac100", "nexus7"):
             options.extend(["-f", "plain"])
 
-    if (config.project in ("ubuntu-base", "ubuntu-core", "ubuntu-touch",
-                           "ubuntu-touch-custom") or
-        (config.project == "ubuntu-desktop-next" and
-         config.subproject == "system-image")):
+    if config.project in ("ubuntu-base", "ubuntu-core", "ubuntu-touch"):
         options.extend(["-f", "plain"])
 
     if config.subproject == "wubi":
-        if config["DIST"] >= "quantal":
+        if config["DIST"] >= "trusty":
             # TODO: Turn this back on once Wubi's resize2fs supports it.
             # options.extend(["-f", "ext4"])
             options.extend(["-f", "ext3"])
@@ -140,14 +137,9 @@
 
 def live_project(config, arch):
     project = config.project
-    series = config["DIST"]
 
     if project == "livecd-base":
         liveproject = "base"
-    elif project == "tocd3.1":
-        liveproject = "tocd"
-    elif project == "ubuntu-touch-custom":
-        liveproject = "ubuntu-touch"
     elif (project == "ubuntu-server" and
           config.image_type == "daily-preinstalled"):
         liveproject = "ubuntu-cpc"
@@ -155,13 +147,9 @@
         liveproject = project
 
     cpuarch, subarch = split_arch(arch)
-    if cpuarch == "lpia" and series <= "hardy":
-        liveproject = "%s-lpia" % liveproject
 
     if config["CDIMAGE_DVD"]:
-        if ((project in ("ubuntu", "kubuntu") and series >= "hardy") or
-                (project == "edubuntu" and series >= "karmic") or
-                (project == "ubuntustudio" and series >= "precise")):
+        if project in ("ubuntu", "kubuntu", "edubuntu", "ubuntustudio"):
             liveproject += "-dvd"
 
     return liveproject
@@ -176,8 +164,7 @@
 
     if config["UBUNTU_DEFAULTS_LOCALE"]:
         command.extend(["-u", config["UBUNTU_DEFAULTS_LOCALE"]])
-    elif config["DIST"] >= "oneiric":
-        command.append("-l")
+    command.append("-l")
 
     command.extend(live_build_options(config, arch))
 
@@ -482,28 +469,19 @@
     series = config["DIST"]
 
     if cpuarch == "amd64":
-        if series <= "dapper":
-            return ["amd64-generic"]
-        elif series <= "oneiric":
+        if project == "ubuntustudio":
+            return ["lowlatency"]
+        else:
             return ["generic"]
-        else:
-            if project == "ubuntustudio":
-                return ["lowlatency"]
-            else:
-                return ["generic"]
     elif cpuarch == "arm64":
         return ["generic"]
     elif cpuarch == "armel":
-        if series == "jaunty":
-            # We don't have any fallback flavour on armel.
-            return ["imx51"]
+        if subarch == "mx5":
+            return ["linaro-lt-mx5"]
         else:
-            if subarch == "mx5":
-                return ["linaro-lt-mx5"]
-            else:
-                # Assume one kernel flavour for each subarch named like the
-                # subarch.
-                return [subarch]
+            # Assume one kernel flavour for each subarch named like the
+            # subarch.
+            return [subarch]
     elif cpuarch == "armhf":
         if subarch == "mx5":
             return ["linaro-lt-mx5"]
@@ -512,11 +490,7 @@
     elif cpuarch == "hppa":
         return ["hppa32", "hppa64"]
     elif cpuarch == "i386":
-        if series <= "dapper":
-            return ["i386"]
-        elif series <= "oneiric":
-            return ["generic"]
-        elif series <= "precise":
+        if series <= "precise":
             if project in ("ubuntu", "edubuntu", "mythbuntu"):
                 # lts-quantal
                 return ["generic"]
@@ -533,20 +507,9 @@
             else:
                 return ["generic"]
     elif cpuarch == "ia64":
-        if series <= "dapper":
-            return ["itanium-smp", "mckinley-smp"]
-        elif series <= "jaunty":
-            return ["itanium", "mckinley"]
-        else:
-            return ["ia64"]
-    elif cpuarch == "lpia":
-        return ["lpia"]
+        return ["ia64"]
     elif cpuarch == "powerpc":
-        if subarch == "ps3" and series <= "gutsy":
-            return ["cell"]
-        elif series <= "oneiric":
-            return ["powerpc", "powerpc64-smp"]
-        elif series <= "xenial":
+        if series <= "xenial":
             return ["powerpc-smp", "powerpc64-smp"]
         else:
             return ["powerpc-smp", "generic"]
@@ -561,61 +524,6 @@
             "No live filesystem source known for %s" % arch)
 
 
-def live_item_path_winfoss(config, arch):
-    # This is a mess of special cases.  Fortunately it is now only of
-    # historical interest.
-    cpuarch, subarch = split_arch(arch)
-    project = config.project
-    series = config["DIST"]
-
-    if series == "warty" or cpuarch not in ("amd64", "i386"):
-        return
-
-    maitri = "http://maitri.ubuntu.com/theopencd"
-    henrik = "http://people.canonical.com/~henrik/winfoss"
-
-    if project == "ubuntu":
-        if series == "hoary":
-            if cpuarch == "i386":
-                yield "%s/ubuntu/winfoss/latest/Hoary-WinFOSS.tgz" % maitri
-            elif cpuarch == "amd64":
-                yield ("%s/ubuntu/amd64/latest/"
-                       "Hoary-WinFOSS-amd64.tgz" % maitri)
-        elif series == "breezy":
-            yield "%s/winfoss/ubuntu/current/Ubuntu-WinFOSS-5.10.tgz" % maitri
-        elif series >= "dapper" and series <= "karmic":
-            if series > "gutsy":
-                series = Series.find_by_name("gutsy")
-            yield "%s/%s/ubuntu/current/ubuntu-winfoss-%s.tar.gz" % (
-                henrik, series, series.version)
-    elif project == "kubuntu":
-        if series == "hoary" and cpuarch == "i386":
-            yield ("%s/kubuntu/winfoss/latest/"
-                   "Kubuntu-WinFOSS-i386.tgz" % maitri)
-        elif series == "breezy":
-            if cpuarch == "i386":
-                yield ("%s/winfoss/kubuntu/current/"
-                       "Kubuntu-WinFOSS-5.10.tgz" % maitri)
-            elif cpuarch == "amd64":
-                yield ("%s/winfoss/kubuntu-AMD/current/"
-                       "Kubuntu-WinFOSS-5.10-AMD.tgz" % maitri)
-        elif series >= "dapper" and series <= "karmic":
-            if series > "gutsy":
-                series = Series.find_by_name("gutsy")
-            yield "%s/%s/kubuntu/current/kubuntu-winfoss-%s.tar.gz" % (
-                henrik, series, series.version)
-    elif project == "edubuntu":
-        if series >= "feisty" and series <= "karmic":
-            if series > "gutsy":
-                series = Series.find_by_name("gutsy")
-            yield "%s/%s/edubuntu/current/edubuntu-winfoss-%s.tar.gz" % (
-                henrik, series, series.version)
-    elif project == "tocd3" and cpuarch == "i386":
-        yield "%s/tocd3/fsm/TOCD3.tgz" % maitri
-    elif project == "tocd3.1" and cpuarch == "i386":
-        yield "%s/winfoss/tocd3.1/current/TOCD-31.tgz" % maitri
-
-
 def live_item_paths(config, arch, item):
     if item == "ltsp-squashfs" and arch == "amd64":
         # use i386 LTSP image on amd64 too
@@ -630,22 +538,31 @@
         liveproject_subarch = liveproject
 
     lp, lp_livefs = get_lp_livefs(config, arch)
+    uris = []
+    root = ""
     if lp_livefs is not None:
         lp_kwargs = live_build_lp_kwargs(config, lp, lp_livefs, arch)
         lp_build = lp_livefs.getLatestBuild(
             lp_kwargs["distro_arch_series"],
             unique_key=lp_kwargs.get("unique_key"))
-        lp_urls = list(lp_build.getFileUrls())
-
-        def urls_for(base):
-            for url in lp_urls:
-                if unquote(os.path.basename(url)) == base:
-                    yield url
+        uris = list(lp_build.getFileUrls())
     else:
         root = livecd_base(config, arch)
+        try:
+            uris = [ os.path.join(root, u) for u in os.listdir(root) ]
+        except OSError:
+            # fallback to exact given uri (for http://) in url_for as we can't
+            # list content.
+            pass
 
-        def urls_for(base):
-            yield "%s/%s" % (root, base)
+    def urls_for(base, item):
+        if uris:
+            for uri in uris:
+                filename = unquote(os.path.basename(uri))
+                if filename.startswith(base + '.') and filename.endswith('.' + item):
+                    yield uri
+        else:
+            yield os.path.join(root, base + '.' + item)
 
     if item in (
         "cloop", "squashfs", "manifest", "manifest-desktop", "manifest-remove",
@@ -653,27 +570,22 @@
         "rootfs.tar.gz", "custom.tar.gz", "device.tar.gz",
         "azure.device.tar.gz", "raspi2.device.tar.gz", "plano.device.tar.gz",
         "tar.xz", "iso", "os.snap", "kernel.snap", "disk1.img.xz",
-        "dragonboard.kernel.snap", "raspi2.kernel.snap", "installer.squashfs",
-        "maas-rack.squashfs", "maas-region.squashfs",
+        "dragonboard.kernel.snap", "raspi2.kernel.snap",
         "img.xz", "model-assertion"
     ):
-        if project == "tocd3":
-            # auto-purged - reverting to plan B
-            yield "/home/cjwatson/tocd3/livecd.tocd3.%s" % item
-        elif project == "ubuntu" and series == "breezy":
-            # auto-purged - reverting to plan B
-            yield "/home/cjwatson/breezy-live/ubuntu/livecd.%s.%s" % (
-                arch, item)
-        elif item == "ext4" and arch == "armhf+nexus7":
+        if item == "ext4" and arch == "armhf+nexus7":
             for url in urls_for(
-                    "livecd.%s.%s-nexus7" % (liveproject_subarch, item)):
+                    "livecd." + liveproject_subarch, item + "-nexus7"):
                 yield url
         elif item == "disk1.img.xz":
             for url in urls_for(
-                    "livecd.%s.%s" % (liveproject, item)):
+                    "livecd." + liveproject, item):
                 yield url
         else:
-            for url in urls_for("livecd.%s.%s" % (liveproject_subarch, item)):
+            for url in urls_for("livecd."+ liveproject_subarch, item):
+                # filter out redundant artefacts
+                if url.endswith("modules.squashfs"):
+                    continue
                 yield url
     elif item in (
         "kernel", "initrd", "bootimg", "modules.squashfs"
@@ -681,8 +593,7 @@
         our_flavours = flavours(config, arch)
         our_flavours.extend(["%s-hwe" % (f,) for f in our_flavours])
         for flavour in our_flavours:
-            base = "livecd.%s.%s-%s" % (liveproject_subarch, item, flavour)
-            for url in urls_for(base):
+            for url in urls_for("livecd." + liveproject_subarch, item + "-" + flavour):
                 yield url
     elif item in (
         "boot-%s+%s.img" % (target.ubuntu_arch, target.subarch)
@@ -695,35 +606,30 @@
             for target in Touch.list_targets_by_ubuntu_arch(arch)
     ):
         for flavour in flavours(config, arch):
-            base = "livecd.%s.%s" % (liveproject_subarch, item)
-            for url in urls_for(base):
+            for url in urls_for("livecd." + liveproject_subarch, item):
                 yield url
     elif item == "kernel-efi-signed":
         if series >= "precise" and arch == "amd64":
             for flavour in flavours(config, arch):
-                base = "livecd.%s.kernel-%s.efi.signed" % (
-                    liveproject_subarch, flavour)
-                for url in urls_for(base):
+                for url in urls_for("livecd." + liveproject_subarch,
+                                    "kernel-" + flavour + ".efi.signed"):
                     yield url
-    elif item == "winfoss":
-        for path in live_item_path_winfoss(config, arch):
-            yield path
     elif item == "wubi":
-        if (project != "xubuntu" and arch in ("amd64", "i386") and
-                series >= "gutsy"):
+        if (project != "xubuntu" and arch in ("amd64", "i386")):
             yield ("http://people.canonical.com/~ubuntu-archive/wubi/%s/"
                    "stable" % series)
-    elif item == "umenu":
-        if arch in ("amd64", "i386") and series == "hardy":
-            yield "http://people.canonical.com/~evand/umenu/stable"
     elif item == "usb-creator":
         if arch in ("amd64", "i386"):
             yield ("http://people.canonical.com/~evand/usb-creator/%s/"
                    "stable" % series)
     elif item == "ltsp-squashfs":
         if arch in ("amd64", "i386"):
-            for url in urls_for("livecd.%s-ltsp.squashfs" % liveproject):
+            for url in urls_for("livecd." + liveproject + "-ltsp", "squashfs"):
                 yield url
+    # generic artefacts we always download
+    elif item.endswith("squashfs") or item.endswith("manifest") or item.endswith("size"):
+        for url in urls_for("livecd." + liveproject_subarch, item):
+            yield url
     else:
         raise UnknownLiveItem("Unknown live filesystem item '%s'" % item)
 
@@ -824,29 +730,31 @@
                 found = True
             except osextras.FetchError:
                 pass
-    elif item in ("wubi", "umenu", "usb-creator"):
+    elif item in ("wubi", "usb-creator"):
         target = os.path.join(output_dir, "%s.%s.exe" % (arch, item))
         try:
             osextras.fetch(config, urls[0], target)
             found = True
         except osextras.FetchError:
             pass
-    elif item == "winfoss":
-        target = os.path.join(output_dir, "%s.%s.tgz" % (arch, item))
-        try:
-            osextras.fetch(config, urls[0], target)
-            found = True
-        except osextras.FetchError:
-            pass
     else:
-        target = os.path.join(output_dir, "%s.%s" % (arch, item))
-        try:
-            osextras.fetch(config, urls[0], target)
-            if item in ["squashfs", "server-squashfs"]:
-                sign.sign_cdimage(config, target)
-            found = True
-        except osextras.FetchError:
-            pass
+        for url in urls:
+            # server-squashfs isn't the suffix of the downloadable item.
+            # prefer a special case over removing suffix + reinjecting item
+            # when suffix != item
+            if item == "server-squashfs":
+                target = os.path.join(output_dir, "%s.%s" % (arch, item))
+            # strip livecd.<PROJECT> and replace by arch
+            else:
+                filename = unquote(os.path.basename(url)).split('.', 2)[-1]
+                target = os.path.join(output_dir, "%s.%s" % (arch, filename))
+            try:
+                osextras.fetch(config, url, target)
+                if target.endswith("squashfs"):
+                    sign.sign_cdimage(config, target)
+                found = True
+            except osextras.FetchError:
+                pass
     return found
 
 
@@ -909,9 +817,6 @@
             elif download_live_items(config, arch, "cloop"):
                 got_image = True
             elif download_live_items(config, arch, "squashfs"):
-                download_live_items(config, arch, "installer.squashfs")
-                download_live_items(config, arch, "maas-rack.squashfs")
-                download_live_items(config, arch, "maas-region.squashfs")
                 download_live_items(config, arch, "modules.squashfs")
                 got_image = True
             elif download_live_items(config, arch, "rootfs.tar.gz"):
@@ -920,8 +825,7 @@
                 got_image = True
             else:
                 continue
-            if (series >= "dapper" and
-                    project != "ubuntu-base" and
+            if (project != "ubuntu-base" and
                     not config["CDIMAGE_SQUASHFS_BASE"] and
                     config.subproject != "wubi"):
                 download_live_items(config, arch, "kernel")
@@ -943,21 +847,9 @@
 
             if (project not in ("livecd-base", "ubuntu-base", "ubuntu-core",
                                 "kubuntu-active") and
-                    (project != "ubuntu-desktop-next" or
-                     config.subproject == "system-image") and
                     (project != "edubuntu" or series >= "precise") and
-                    (project != "ubuntukylin" or series < "utopic")):
-                if series <= "feisty":
-                    pass
-                elif series <= "intrepid":
-                    if config["CDIMAGE_DVD"] != "1":
-                        download_live_items(config, arch, "wubi")
-                    download_live_items(config, arch, "umenu")
-                    umenu_path = os.path.join(
-                        output_dir, "%s.umenu.exe" % arch)
-                    if os.path.exists(umenu_path):
-                        write_autorun(config, arch, "umenu.exe", "Install")
-                elif series <= "vivid":
+                    (project != "ubuntukylin" or series <= "trusty")):
+                if series <= "trusty":
                     # TODO: We still have to do something about not
                     # including Wubi on the DVDs.
                     download_live_items(config, arch, "wubi")
@@ -976,19 +868,15 @@
                             "Install %s" % autorun_project)
 
             if project not in ("livecd-base", "ubuntu-base", "ubuntu-core",
-                               "ubuntu-desktop-next", "edubuntu"):
-                if (project in ("kubuntu-active", "ubuntu-netbook",
-                                "ubuntu-moblin-remix") or
-                        config["CDIMAGE_DVD"] or
-                        series >= "maverick"):
-                    download_live_items(config, arch, "usb-creator")
+                               "edubuntu"):
+                download_live_items(config, arch, "usb-creator")
             if project == "ubuntu-core" and config["CDIMAGE_LIVE"]:
                 download_live_items(config, arch, "model-assertion")
 
         if not got_image:
             raise NoFilesystemImages("No filesystem images found.")
 
-    if config.project in ("ubuntu-touch", "ubuntu-touch-custom"):
+    if config.project == "ubuntu-touch":
         for arch in config.arches:
             for abootimg in (
                 "boot-%s+%s.img" % (target.ubuntu_arch, target.subarch)
@@ -1013,7 +901,7 @@
                 )
             download_live_items(config, arch, "custom.tar.gz")
 
-    if config.project in ("ubuntu-core", "ubuntu-desktop-next"):
+    if config.project == "ubuntu-core":
         for arch in config.arches:
             download_live_items(config, arch, "device.tar.gz")
 
@@ -1031,12 +919,7 @@
             if arch == "arm64":
                 download_live_items(config, arch, "dragonboard.kernel.snap")
 
-    if (project == "edubuntu" and config["CDIMAGE_INSTALL"] and
-            series <= "hardy"):
-        for cpuarch in config.cpuarches:
-            download_live_items(config, arch, "winfoss")
-
-    if project == "edubuntu" and config["CDIMAGE_DVD"] and series >= "lucid":
+    if project == "edubuntu" and config["CDIMAGE_DVD"]:
         for arch in config.arches:
             if arch in ("amd64", "i386"):
                 # TODO: Disabled for raring (LP: #1154601)
 
=== modified file 'lib/cdimage/project.py'
--- lib/cdimage/project.py	2017-05-01 02:22:20 +0000
+++ lib/cdimage/project.py	2019-03-07 16:20:18 +0000
@@ -29,19 +29,13 @@
 # values of 25 - (length of longest relevant architecture name).
 project_map = {
     "ubuntu": "Ubuntu",
-    "ubuntu-desktop-next": "Ubuntu-Desktop-Next",
     "ubuntu-zh_CN": "Ubuntu Chinese Edition",
     "kubuntu": "Kubuntu",
     "kubuntu-active": "Kubuntu-Active",
-    "kubuntu-plasma5": "Kubuntu-Plasma-5",
     "edubuntu": "Edubuntu",
     "xubuntu": "Xubuntu",
     "gobuntu": "Gobuntu",
     "ubuntu-server": "Ubuntu-Server",
-    "jeos": "Ubuntu-JeOS",
-    "ubuntu-mid": "Ubuntu-MID",
-    "ubuntu-netbook": "Ubuntu-Netbook",
-    "ubuntu-headless": "Ubuntu-Headless",
     "ubuntustudio": "Ubuntu-Studio",
     "mythbuntu": "Mythbuntu",
     "lubuntu": "Lubuntu",
@@ -50,15 +44,11 @@
     "ubuntu-gnome": "Ubuntu-GNOME",
     "ubuntu-budgie": "Ubuntu-Budgie",
     "ubuntu-mate": "Ubuntu-MATE",
-    "ubuntu-moblin-remix": "Ubuntu-Moblin-Remix",
     "livecd-base": "LiveCD-Base",
     "ubuntu-core": "Ubuntu Core",
     "ubuntu-base": "Ubuntu-Base",
     "ubuntu-touch-preview": "Ubuntu Touch Preview",
     "ubuntu-touch": "Ubuntu Touch",
-    "ubuntu-touch-custom": "Ubuntu Touch Custom Build",
-    "tocd3": "TheOpenCDv3",
-    "tocd3.1": "TheOpenCDv3.1",
 }
 
 
 
=== modified file 'lib/cdimage/tests/test_build.py'
--- lib/cdimage/tests/test_build.py	2018-01-09 01:47:28 +0000
+++ lib/cdimage/tests/test_build.py	2019-03-07 16:20:18 +0000
@@ -74,7 +74,7 @@
         super(TestUpdateLocalIndices, self).setUp()
         self.config = Config(read=False)
         self.config.root = self.use_temp_dir()
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["CPUARCHES"] = "i386"
         self.packages = os.path.join(self.temp_dir, "local", "packages")
         self.database = os.path.join(self.temp_dir, "local", "database")
@@ -118,45 +118,45 @@
                 expected_command, cwd=self.packages)
 
         self.assertCountEqual([
-            "raring_local_binary-i386.list",
-            "raring_local_debian-installer_binary-i386.list",
+            "trusty_local_binary-i386.list",
+            "trusty_local_debian-installer_binary-i386.list",
         ], os.listdir(self.dists))
         with open(os.path.join(
-                self.dists, "raring_local_binary-i386.list")) as f:
+                self.dists, "trusty_local_binary-i386.list")) as f:
             self.assertCountEqual([
                 "pool/local/f/fake/fake_1_i386.deb",
                 "pool/local/f/fake/fake-nf_1_all.deb",
             ], f.read().splitlines())
         with open(os.path.join(
                 self.dists,
-                "raring_local_debian-installer_binary-i386.list")) as f:
+                "trusty_local_debian-installer_binary-i386.list")) as f:
             self.assertCountEqual([
                 "pool/local/f/fake/fake-udeb_1_i386.udeb",
                 "pool/local/f/fake/fake-udeb-indep_1_all.udeb",
             ], f.read().splitlines())
 
         self.assertCountEqual([
-            "override.raring.local.i386",
-            "override.raring.local.debian-installer.i386",
+            "override.trusty.local.i386",
+            "override.trusty.local.debian-installer.i386",
         ], os.listdir(self.indices))
         with open(os.path.join(
-                self.indices, "override.raring.local.i386")) as f:
+                self.indices, "override.trusty.local.i386")) as f:
             self.assertCountEqual([
                 "fake\toptional\tlocal/misc",
                 "fake-nf\textra\tlocal/admin",
             ], f.read().splitlines())
         with open(os.path.join(
                 self.indices,
-                "override.raring.local.debian-installer.i386")) as f:
+                "override.trusty.local.debian-installer.i386")) as f:
             self.assertCountEqual([
                 "fake-udeb\toptional\tlocal/debian-installer",
                 "fake-udeb-indep\textra\tlocal/debian-installer",
             ], f.read().splitlines())
 
         self.assertTrue(os.path.exists(os.path.join(
-            self.packages, "dists", "raring", "local", "binary-i386")))
+            self.packages, "dists", "trusty", "local", "binary-i386")))
         self.assertTrue(os.path.exists(os.path.join(
-            self.packages, "dists", "raring", "local", "debian-installer",
+            self.packages, "dists", "trusty", "local", "debian-installer",
             "binary-i386")))
 
 
@@ -189,23 +189,23 @@
                 raise osextras.FetchError
 
         mock_fetch.side_effect = fetch_side_effect
-        self.config["DIST"] = "oneiric"
+        self.config["DIST"] = "precise"
         self.config["ARCHES"] = "i386"
         build_ubuntu_defaults_locale(self.config)
         output_dir = os.path.join(
-            self.temp_dir, "scratch", "ubuntu-zh_CN", "oneiric", "daily-live",
+            self.temp_dir, "scratch", "ubuntu-zh_CN", "precise", "daily-live",
             "live")
         self.assertTrue(os.path.isdir(output_dir))
         self.assertCountEqual([
-            "oneiric-desktop-i386.iso",
-            "oneiric-desktop-i386.list",
-            "oneiric-desktop-i386.manifest",
-            "oneiric-desktop-i386.manifest-remove",
-            "oneiric-desktop-i386.size",
+            "precise-desktop-i386.iso",
+            "precise-desktop-i386.list",
+            "precise-desktop-i386.manifest",
+            "precise-desktop-i386.manifest-remove",
+            "precise-desktop-i386.size",
         ], os.listdir(output_dir))
         mock_check_call.assert_called_once_with([
             os.path.join(self.temp_dir, "debian-cd", "tools", "pi-makelist"),
-            os.path.join(output_dir, "oneiric-desktop-i386.iso"),
+            os.path.join(output_dir, "precise-desktop-i386.iso"),
         ], stdout=mock.ANY)
 
 
@@ -243,7 +243,7 @@
         mock_fetch.side_effect = fetch_side_effect
         mock_sign.side_effect = sign_side_effect
         self.config["PROJECT"] = "livecd-base"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "livecd-base"
         self.config["ARCHES"] = "i386"
         self.capture_logging()
@@ -253,7 +253,7 @@
             self.epoch_date,
         ])
         live_dir = os.path.join(
-            self.temp_dir, "scratch", "livecd-base", "raring", "livecd-base",
+            self.temp_dir, "scratch", "livecd-base", "trusty", "livecd-base",
             "live")
         self.assertTrue(os.path.isdir(live_dir))
         self.assertCountEqual(
@@ -271,7 +271,7 @@
 
         mock_fetch.side_effect = fetch_side_effect
         self.config["PROJECT"] = "ubuntu-base"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         self.config["ARCHES"] = "i386"
         self.capture_logging()
@@ -283,15 +283,15 @@
             self.epoch_date,
         ])
         output_dir = os.path.join(
-            self.temp_dir, "scratch", "ubuntu-base", "raring", "daily",
+            self.temp_dir, "scratch", "ubuntu-base", "trusty", "daily",
             "debian-cd", "i386")
         self.assertTrue(os.path.isdir(output_dir))
         self.assertCountEqual([
-            "raring-base-i386.manifest",
-            "raring-base-i386.raw",
-            "raring-base-i386.type",
+            "trusty-base-i386.manifest",
+            "trusty-base-i386.raw",
+            "trusty-base-i386.type",
         ], os.listdir(output_dir))
-        with open(os.path.join(output_dir, "raring-base-i386.type")) as f:
+        with open(os.path.join(output_dir, "trusty-base-i386.type")) as f:
             self.assertEqual("tar archive\n", f.read())
 
     @mock.patch("cdimage.osextras.fetch")
@@ -376,7 +376,7 @@
         mock_fetch.side_effect = fetch_side_effect
         self.config["CDIMAGE_PREINSTALLED"] = "1"
         self.config["PROJECT"] = project
-        self.config["DIST"] = "saucy"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily-preinstalled"
         self.config["ARCHES"] = "armhf"
         self.capture_logging()
@@ -388,34 +388,34 @@
             self.epoch_date,
         ])
         output_dir = os.path.join(
-            self.temp_dir, "scratch", project, "saucy",
+            self.temp_dir, "scratch", project, "trusty",
             "daily-preinstalled", "debian-cd", "armhf")
         self.assertTrue(os.path.isdir(output_dir))
-        touch_files = ["saucy-preinstalled-boot-%s+%s.img" % (
+        touch_files = ["trusty-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(["saucy-preinstalled-recovery-%s+%s.img" % (
+        touch_files.extend(["trusty-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(["saucy-preinstalled-system-%s+%s.img" % (
+        touch_files.extend(["trusty-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([
-            "saucy-preinstalled-touch-armhf.manifest",
-            "saucy-preinstalled-touch-armhf.raw",
-            "saucy-preinstalled-touch-armhf.type",
-            "saucy-preinstalled-touch-armhf.tar.gz",
-            "saucy-preinstalled-touch-armhf.custom.tar.gz",
+            "trusty-preinstalled-touch-armhf.manifest",
+            "trusty-preinstalled-touch-armhf.raw",
+            "trusty-preinstalled-touch-armhf.type",
+            "trusty-preinstalled-touch-armhf.tar.gz",
+            "trusty-preinstalled-touch-armhf.custom.tar.gz",
             ])
         self.assertCountEqual(touch_files, os.listdir(output_dir))
         with open(os.path.join(
-            output_dir, "saucy-preinstalled-touch-armhf.type")
+            output_dir, "trusty-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 = "saucy-preinstalled-system-%s+%s.img" % (
+            system_img = "trusty-preinstalled-system-%s+%s.img" % (
                 touch_target.android_arch, touch_target.subarch)
-            recovery_img = "saucy-preinstalled-recovery-%s+%s.img" % (
+            recovery_img = "trusty-preinstalled-recovery-%s+%s.img" % (
                 touch_target.android_arch, touch_target.subarch)
             self.assertTrue(os.path.exists(
                 os.path.join(output_dir, system_img)))
@@ -425,41 +425,6 @@
     def test_ubuntu_touch(self):
         self._perform_ubuntu_touch_testing("ubuntu-touch")
 
-    def test_ubuntu_touch_custom(self):
-        self._perform_ubuntu_touch_testing("ubuntu-touch-custom")
-
-    @mock.patch("cdimage.osextras.fetch")
-    def test_ubuntu_desktop_next_system_image(self, mock_fetch):
-        def fetch_side_effect(config, source, target):
-            if (target.endswith(".manifest") or
-                    target.endswith(".rootfs.tar.gz")):
-                touch(target)
-            else:
-                raise osextras.FetchError
-
-        mock_fetch.side_effect = fetch_side_effect
-        self.config["PROJECT"] = "ubuntu-desktop-next"
-        self.config["SUBPROJECT"] = "system-image"
-        self.config["DIST"] = "utopic"
-        self.config["IMAGE_TYPE"] = "daily"
-        self.config["ARCHES"] = "i386"
-        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", "ubuntu-desktop-next", "utopic", "daily",
-            "live")
-        self.assertTrue(os.path.isdir(output_dir))
-        self.assertCountEqual([
-            "i386.manifest",
-            "i386.rootfs.tar.gz",
-        ], os.listdir(output_dir))
-
 
 class TestExtractDebootstrap(TestCase):
     def setUp(self):
@@ -469,27 +434,27 @@
 
     def test_debootstrap_script(self):
         for series, script in (
-            ("gutsy", "usr/lib/debootstrap/scripts/gutsy"),
-            ("hardy", "usr/share/debootstrap/scripts/hardy"),
+            ("precise", "usr/share/debootstrap/scripts/precise"),
+            ("bionic", "usr/share/debootstrap/scripts/bionic"),
         ):
             self.config["DIST"] = series
             self.assertEqual(script, _debootstrap_script(self.config))
 
     def test_extract_debootstrap(self):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         self.config["ARCHES"] = "amd64+mac"
         mirror_dir = os.path.join(self.temp_dir, "ftp")
         packages_path = os.path.join(
-            mirror_dir, "dists", "raring", "main", "debian-installer",
+            mirror_dir, "dists", "trusty", "main", "debian-installer",
             "binary-amd64", "Packages.gz")
         udeb_path = os.path.join(
             mirror_dir, "pool", "main", "d", "debootstrap",
             "debootstrap-udeb_1_all.udeb")
         self.make_deb(
             udeb_path, "debian-installer", "extra",
-            files={"/usr/share/debootstrap/scripts/raring": b"sentinel"})
+            files={"/usr/share/debootstrap/scripts/trusty": b"sentinel"})
         os.makedirs(os.path.dirname(packages_path))
         with gzip.GzipFile(packages_path, "wb") as packages:
             ftparchive = subprocess.Popen(
@@ -500,8 +465,8 @@
             self.assertEqual(0, ftparchive.returncode)
         extract_debootstrap(self.config)
         output_path = os.path.join(
-            self.temp_dir, "scratch", "ubuntu", "raring", "daily",
-            "debootstrap", "raring-amd64+mac")
+            self.temp_dir, "scratch", "ubuntu", "trusty", "daily",
+            "debootstrap", "trusty-amd64+mac")
         self.assertTrue(os.path.exists(output_path))
         with open(output_path, "rb") as output:
             self.assertEqual(b"sentinel", output.read())
@@ -523,10 +488,10 @@
     @mock.patch("cdimage.osextras.unlink_force")
     def test_lock_build_image_set(self, mock_unlink_force, mock_check_call):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         expected_lock_path = os.path.join(
-            self.temp_dir, "etc", ".lock-build-image-set-ubuntu-raring-daily")
+            self.temp_dir, "etc", ".lock-build-image-set-ubuntu-trusty-daily")
         self.assertFalse(os.path.exists(expected_lock_path))
         with lock_build_image_set(self.config):
             mock_check_call.assert_called_once_with([
@@ -539,12 +504,12 @@
     def test_lock_build_image_set_chinese(self, mock_unlink_force,
                                           mock_check_call):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         self.config["UBUNTU_DEFAULTS_LOCALE"] = "zh_CN"
         expected_lock_path = os.path.join(
             self.temp_dir, "etc",
-            ".lock-build-image-set-ubuntu-chinese-edition-raring-daily")
+            ".lock-build-image-set-ubuntu-chinese-edition-trusty-daily")
         self.assertFalse(os.path.exists(expected_lock_path))
         with lock_build_image_set(self.config):
             mock_check_call.assert_called_once_with([
@@ -554,25 +519,20 @@
 
     def test_configure_onlyfree_unsupported(self):
         for project, series, onlyfree, unsupported in (
-            ("ubuntu", "raring", False, False),
+            ("ubuntu", "trusty", False, False),
             ("gobuntu", "hardy", True, False),
-            ("edubuntu", "jaunty", False, False),
-            ("edubuntu", "karmic", False, True),
-            ("xubuntu", "gutsy", False, False),
-            ("xubuntu", "hardy", False, True),
+            ("edubuntu", "precise", False, True),
+            ("xubuntu", "precise", False, True),
             ("kubuntu", "precise", False, False),
-            ("kubuntu", "quantal", False, True),
-            ("kubuntu-active", "raring", False, True),
-            ("kubuntu-plasma5", "utopic", False, True),
-            ("ubuntustudio", "raring", False, True),
-            ("mythbuntu", "raring", False, True),
-            ("lubuntu", "raring", False, True),
-            ("ubuntukylin", "raring", False, True),
-            ("ubuntu-gnome", "raring", False, True),
-            ("ubuntu-budgie", "zesty", False, True),
-            ("ubuntu-mate", "vivid", False, True),
-            ("ubuntu-moblin-remix", "raring", False, True),
-            ("ubuntu-desktop-next", "utopic", False, False),
+            ("kubuntu", "trusty", False, True),
+            ("kubuntu-active", "trusty", False, True),
+            ("ubuntustudio", "trusty", False, True),
+            ("mythbuntu", "trusty", False, True),
+            ("lubuntu", "trusty", False, True),
+            ("ubuntukylin", "trusty", False, True),
+            ("ubuntu-gnome", "trusty", False, True),
+            ("ubuntu-budgie", "bionic", False, True),
+            ("ubuntu-mate", "xenial", False, True),
         ):
             config = Config(read=False)
             config["PROJECT"] = project
@@ -605,7 +565,7 @@
 
     def test_open_log_writes_log(self):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         self.config["CDIMAGE_DATE"] = "20130224"
         pid = os.fork()
@@ -620,7 +580,7 @@
         else:  # parent
             self.wait_for_pid(pid, 0)
             expected_log_path = os.path.join(
-                self.temp_dir, "log", "ubuntu", "raring", "daily-20130224.log")
+                self.temp_dir, "log", "ubuntu", "trusty", "daily-20130224.log")
             self.assertTrue(os.path.exists(expected_log_path))
             with open(expected_log_path) as log:
                 self.assertEqual([
@@ -631,7 +591,7 @@
 
     def test_open_log_chinese(self):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         self.config["UBUNTU_DEFAULTS_LOCALE"] = "zh_CN"
         self.config["CDIMAGE_DATE"] = "20130224"
@@ -647,7 +607,7 @@
         else:  # parent
             self.wait_for_pid(pid, 0)
             expected_log_path = os.path.join(
-                self.temp_dir, "log", "ubuntu-chinese-edition", "raring",
+                self.temp_dir, "log", "ubuntu-chinese-edition", "trusty",
                 "daily-20130224.log")
             self.assertTrue(os.path.exists(expected_log_path))
             with open(expected_log_path) as log:
@@ -880,7 +840,7 @@
             ["make", "-C", os.path.dirname(path)])
 
     def test_configure_splash(self):
-        data_dir = os.path.join(self.temp_dir, "debian-cd", "data", "raring")
+        data_dir = os.path.join(self.temp_dir, "debian-cd", "data", "trusty")
         for key, extension in (
             ("SPLASHRLE", "rle"),
             ("GFXSPLASH", "pcx"),
@@ -890,7 +850,7 @@
                 config = Config(read=False)
                 config.root = self.temp_dir
                 config["PROJECT"] = "kubuntu"
-                config["DIST"] = "raring"
+                config["DIST"] = "trusty"
                 path = os.path.join(
                     data_dir, "%s.%s" % (
                         "kubuntu" if project_specific else "splash",
@@ -941,10 +901,10 @@
 
     def test_fix_permissions(self):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         scratch_dir = os.path.join(
-            self.temp_dir, "scratch", "ubuntu", "raring", "daily")
+            self.temp_dir, "scratch", "ubuntu", "trusty", "daily")
         subdir = os.path.join(scratch_dir, "x")
         dir_one = os.path.join(subdir, "1")
         file_two = os.path.join(subdir, "2")
@@ -978,14 +938,14 @@
 
     @mock.patch("cdimage.build.send_mail")
     def test_notify_failure_no_recipients(self, mock_send_mail):
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         notify_failure(self.config, None)
         self.assertEqual(0, mock_send_mail.call_count)
 
     @mock.patch("cdimage.build.send_mail")
     def test_notify_failure_no_log(self, mock_send_mail):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         self.config["CDIMAGE_DATE"] = "20130225"
         path = os.path.join(self.temp_dir, "production", "notify-addresses")
@@ -993,13 +953,13 @@
             print("ALL\[e-mail]", file=notify_addresses)
         notify_failure(self.config, None)
         mock_send_mail.assert_called_once_with(
-            "CD image ubuntu/raring/daily failed to build on 20130225",
+            "CD image ubuntu/trusty/daily failed to build on 20130225",
             "build-image-set", ["[e-mail]"], "")
 
     @mock.patch("cdimage.build.send_mail")
     def test_notify_failure_log(self, mock_send_mail):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         self.config["CDIMAGE_DATE"] = "20130225"
         path = os.path.join(self.temp_dir, "production", "notify-addresses")
@@ -1010,14 +970,14 @@
             print("Log", file=log)
         notify_failure(self.config, log_path)
         mock_send_mail.assert_called_once_with(
-            "CD image ubuntu/raring/daily failed to build on 20130225",
+            "CD image ubuntu/trusty/daily failed to build on 20130225",
             "build-image-set", ["[e-mail]"], mock.ANY)
         self.assertEqual(log_path, mock_send_mail.call_args[0][3].name)
 
     @mock.patch("cdimage.build.send_mail")
     def test_notify_failure_chinese(self, mock_send_mail):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         self.config["UBUNTU_DEFAULTS_LOCALE"] = "zh_CN"
         self.config["CDIMAGE_DATE"] = "20130225"
@@ -1029,7 +989,7 @@
             print("Log", file=log)
         notify_failure(self.config, log_path)
         mock_send_mail.assert_called_once_with(
-            "CD image ubuntu-chinese-edition/raring/daily failed to build on "
+            "CD image ubuntu-chinese-edition/trusty/daily failed to build on "
             "20130225",
             "build-image-set", ["[e-mail]"], mock.ANY)
         self.assertEqual(log_path, mock_send_mail.call_args[0][3].name)
@@ -1055,14 +1015,14 @@
     def test_build_image_set_locked_notifies_on_failure(
             self, mock_send_mail, mock_sync_local_mirror, *args):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         self.config["CDIMAGE_DATE"] = "20130225"
         path = os.path.join(self.temp_dir, "production", "notify-addresses")
         with mkfile(path, "w") as notify_addresses:
             print("ALL\[e-mail]", file=notify_addresses)
         log_path = os.path.join(
-            self.temp_dir, "log", "ubuntu", "raring", "daily-20130225.log")
+            self.temp_dir, "log", "ubuntu", "trusty", "daily-20130225.log")
         os.makedirs(os.path.join(self.temp_dir, "etc"))
 
         def force_failure(*args):
@@ -1113,7 +1073,7 @@
             mock_tracker_set_rebuild_status, mock_call):
         self.config["PROJECT"] = "ubuntu"
         self.config["CAPPROJECT"] = "Ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         self.config["ARCHES"] = "amd64 i386"
         self.config["CPUARCHES"] = "amd64 i386"
@@ -1127,8 +1087,8 @@
         touch(germinate_path)
         os.chmod(germinate_path, 0o755)
         germinate_output = os.path.join(
-            self.temp_dir, "scratch", "ubuntu", "raring", "daily", "germinate")
-        log_dir = os.path.join(self.temp_dir, "log", "ubuntu", "raring")
+            self.temp_dir, "scratch", "ubuntu", "trusty", "daily", "germinate")
+        log_dir = os.path.join(self.temp_dir, "log", "ubuntu", "trusty")
 
         def side_effect(command, *args, **kwargs):
             if command[0] == germinate_path:
@@ -1150,8 +1110,8 @@
                         germinate_path,
                         "--seed-source", mock.ANY,
                         "--mirror", "file://%s/" % germinate_output,
-                        "--seed-dist", "ubuntu.raring",
-                        "--dist", "raring,raring-security,raring-updates",
+                        "--seed-dist", "ubuntu.trusty",
+                        "--dist", "trusty,trusty-security,trusty-updates",
                         "--arch", arch,
                         "--components", "main",
                         "--no-rdepends",
@@ -1204,8 +1164,8 @@
                     DATE
                     ===== Germinating =====
                     DATE
-                    Germinating for raring/amd64 ...
-                    Germinating for raring/i386 ...
+                    Germinating for trusty/amd64 ...
+                    Germinating for trusty/i386 ...
                     ===== Generating new task lists =====
                     DATE
                     ===== Checking for other task changes =====
@@ -1226,10 +1186,10 @@
         "cdimage.build.build_image_set_locked", side_effect=KeyboardInterrupt)
     def test_build_image_set_interrupted(self, *args):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         lock_path = os.path.join(
-            self.temp_dir, "etc", ".lock-build-image-set-ubuntu-raring-daily")
+            self.temp_dir, "etc", ".lock-build-image-set-ubuntu-trusty-daily")
         multipidfile_path = os.path.join(
             self.temp_dir, "etc", ".build-image-set-pids")
         os.makedirs(os.path.dirname(lock_path))
@@ -1241,10 +1201,10 @@
     @mock.patch("cdimage.build.build_image_set_locked")
     def test_build_image_set_terminated(self, mock_build_image_set_locked):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         lock_path = os.path.join(
-            self.temp_dir, "etc", ".lock-build-image-set-ubuntu-raring-daily")
+            self.temp_dir, "etc", ".lock-build-image-set-ubuntu-trusty-daily")
         multipidfile_path = os.path.join(
             self.temp_dir, "etc", ".build-image-set-pids")
         os.makedirs(os.path.dirname(lock_path))
@@ -1264,10 +1224,10 @@
     @mock.patch("cdimage.build.build_image_set_locked")
     def test_build_image_set(self, mock_build_image_set_locked):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         lock_path = os.path.join(
-            self.temp_dir, "etc", ".lock-build-image-set-ubuntu-raring-daily")
+            self.temp_dir, "etc", ".lock-build-image-set-ubuntu-trusty-daily")
         multipidfile_path = os.path.join(
             self.temp_dir, "etc", ".build-image-set-pids")
         os.makedirs(os.path.dirname(lock_path))
 
=== modified file 'lib/cdimage/tests/test_build_id.py'
--- lib/cdimage/tests/test_build_id.py	2014-07-17 17:12:16 +0000
+++ lib/cdimage/tests/test_build_id.py	2019-03-07 16:20:18 +0000
@@ -66,12 +66,12 @@
         config = Config(read=False)
         config.root = self.use_temp_dir()
         config["PROJECT"] = "ubuntu"
-        config["DIST"] = "raring"
+        config["DIST"] = "trusty"
         config["UBUNTU_DEFAULTS_LOCALE"] = "zh_CN"
         os.mkdir(os.path.join(self.temp_dir, "etc"))
         stamp = os.path.join(
             config.root, "etc",
-            ".next-build-suffix-ubuntu-chinese-edition-raring-daily")
+            ".next-build-suffix-ubuntu-chinese-edition-trusty-daily")
         self.assertFalse(os.path.exists(stamp))
         self.assertEqual("20130225", next_build_id(config, ""))
         with open(stamp) as stamp_file:
 
=== modified file 'lib/cdimage/tests/test_check_installable.py'
--- lib/cdimage/tests/test_check_installable.py	2017-08-27 06:42:48 +0000
+++ lib/cdimage/tests/test_check_installable.py	2019-03-07 16:20:18 +0000
@@ -41,7 +41,7 @@
         self.config["PROJECT"] = "ubuntu"
         self.config["CAPPROJECT"] = "Ubuntu"
         self.config["IMAGE_TYPE"] = "daily"
-        self.config["DIST"] = "warty"
+        self.config["DIST"] = "precise"
         self.config["ARCHES"] = "i386"
 
     def test_dirs(self):
@@ -49,29 +49,29 @@
         self.assertEqual(os.path.join(self.config.root, "britney"), britney)
         self.assertEqual(
             os.path.join(
-                self.config.root, "scratch", "ubuntu", "warty", "daily",
+                self.config.root, "scratch", "ubuntu", "precise", "daily",
                 "tmp"),
             image_top)
         self.assertEqual(
             os.path.join(
-                self.config.root, "scratch", "ubuntu", "warty", "daily",
+                self.config.root, "scratch", "ubuntu", "precise", "daily",
                 "live"),
             live)
         self.assertEqual(
-            os.path.join(britney, "data", "ubuntu", "daily", "warty"), data)
+            os.path.join(britney, "data", "ubuntu", "daily", "precise"), data)
 
     def test_prepare_no_packages(self):
         _, _, _, data = _check_installable_dirs(self.config)
         self.capture_logging()
         _prepare_check_installable(self.config)
-        self.assertLogEqual(["No Packages.gz for warty/i386; not checking"])
+        self.assertLogEqual(["No Packages.gz for precise/i386; not checking"])
         self.assertEqual(["Sources"], os.listdir(data))
         self.assertEqual(0, os.stat(os.path.join(data, "Sources")).st_size)
 
     def test_prepare_with_packages(self):
         _, image_top, _, data = _check_installable_dirs(self.config)
         packages_gz = os.path.join(
-            image_top, "warty-i386", "CD1", "dists", "warty", "main",
+            image_top, "precise-i386", "CD1", "dists", "precise", "main",
             "binary-i386", "Packages.gz")
         os.makedirs(os.path.dirname(packages_gz))
         packages_gz_file = gzip.open(packages_gz, "wb")
@@ -125,5 +125,5 @@
             "timeout", "30",
             os.path.join(britney, "rptprobs.sh"), data,
             os.path.join(
-                britney, "report", "ubuntu", "daily", "warty_probs.html"),
-            "Ubuntu warty"], command)
+                britney, "report", "ubuntu", "daily", "precise_probs.html"),
+            "Ubuntu precise"], command)
 
=== modified file 'lib/cdimage/tests/test_config.py'
--- lib/cdimage/tests/test_config.py	2018-10-30 13:23:58 +0000
+++ lib/cdimage/tests/test_config.py	2019-03-07 16:20:18 +0000
@@ -295,12 +295,6 @@
         self.assertEqual(None, config.core_series)
         config["DIST"] = "xenial"
         self.assertEqual("16", config.core_series)
-        config["DIST"] = "yakkety"
-        self.assertEqual("16", config.core_series)
-        config["DIST"] = "zesty"
-        self.assertEqual("16", config.core_series)
-        config["DIST"] = "artful"
-        self.assertEqual("16", config.core_series)
         config["DIST"] = "bionic"
         self.assertEqual("18", config.core_series)
         config["DIST"] = "cosmic"
 
=== modified file 'lib/cdimage/tests/test_germinate.py'
--- lib/cdimage/tests/test_germinate.py	2019-02-22 10:32:26 +0000
+++ lib/cdimage/tests/test_germinate.py	2019-03-07 16:20:18 +0000
@@ -68,10 +68,10 @@
 
     def test_output_dir(self):
         self.config.root = "/cdimage"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "bionic"
         self.config["IMAGE_TYPE"] = "daily"
         self.assertEqual(
-            "/cdimage/scratch/ubuntu/raring/daily/germinate",
+            "/cdimage/scratch/ubuntu/bionic/daily/germinate",
             self.germination.output_dir("ubuntu"))
 
     def test_seed_sources_local_seeds(self):
@@ -82,18 +82,11 @@
 
     def test_seed_sources_bzr(self):
         for project, series, owners in (
-            ("kubuntu", "natty", ["ubuntu-core-dev"]),
-            ("kubuntu", "oneiric", ["kubuntu-dev"]),
-            ("kubuntu-active", "natty", ["ubuntu-core-dev"]),
-            ("kubuntu-active", "oneiric", ["kubuntu-dev"]),
-            ("kubuntu-plasma5", "utopic", ["kubuntu-dev"]),
-            ("mythbuntu", "raring", ["mythbuntu-dev"]),
-            ("xubuntu", "hardy", ["ubuntu-core-dev"]),
-            ("ubuntu-budgie", "zesty",
-             ["ubuntubudgie-dev"]),
-            ("ubuntu-mate", "vivid",
-             ["ubuntu-mate-dev"]),
-            ("ubuntu-moblin-remix", "hardy", ["moblin"]),
+            ("kubuntu", "precise", ["kubuntu-dev"]),
+            ("kubuntu-active", "precise", ["kubuntu-dev"]),
+            ("mythbuntu", "trusty", ["mythbuntu-dev"]),
+            ("ubuntu-budgie", "bionic", ["ubuntubudgie-dev"]),
+            ("ubuntu-mate", "xenial", ["ubuntu-mate-dev"]),
             ("ubuntukylin", "trusty", ["ubuntu-core-dev"]),
         ):
             self.config["DIST"] = series
@@ -106,14 +99,14 @@
             self.assertEqual(sources, self.germination.seed_sources(project))
 
         for project, series, owners in (
-            ("ubuntu", "raring", ["ubuntu-core-dev"]),
-            ("lubuntu", "raring", ["lubuntu-dev", "ubuntu-core-dev"]),
-            ("xubuntu", "intrepid", ["xubuntu-dev", "ubuntu-core-dev"]),
-            ("ubuntu-gnome", "raring",
+            ("ubuntu", "trusty", ["ubuntu-core-dev"]),
+            ("lubuntu", "trusty", ["lubuntu-dev", "ubuntu-core-dev"]),
+            ("xubuntu", "precise", ["xubuntu-dev", "ubuntu-core-dev"]),
+            ("ubuntu-gnome", "trusty",
              ["ubuntu-gnome-dev", "ubuntu-core-dev"]),
-            ("ubuntukylin", "utopic",
+            ("ubuntukylin", "xenial",
              ["ubuntukylin-members", "ubuntu-core-dev"]),
-            ("ubuntustudio", "raring",
+            ("ubuntustudio", "trusty",
              ["ubuntustudio-dev", "ubuntu-core-dev"]),
         ):
             self.config["DIST"] = series
@@ -124,7 +117,7 @@
 
     def test_seed_sources_non_bzr(self):
         self.germination = Germination(self.config, prefer_vcs=False)
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.assertEqual(
             ["http://people.canonical.com/~ubuntu-archive/seeds/"],
             self.germination.seed_sources("ubuntu"))
@@ -141,22 +134,22 @@
 
     def test_make_index(self):
         self.config.root = self.use_temp_dir()
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         files = []
         for component in "main", "restricted", "universe", "multiverse":
             source_dir = os.path.join(
-                self.temp_dir, "ftp", "dists", "raring", component, "source")
+                self.temp_dir, "ftp", "dists", "trusty", component, "source")
             os.makedirs(source_dir)
             with gzip.GzipFile(
                     os.path.join(source_dir, "Sources.gz"), "wb") as sources:
                 sources.write(component.encode("UTF-8"))
                 sources.write(b"\n")
-            files.append("dists/raring/%s/source/Sources.gz" % component)
+            files.append("dists/trusty/%s/source/Sources.gz" % component)
         self.germination.make_index("ubuntu", "i386", files[0], files)
         output_file = os.path.join(
-            self.temp_dir, "scratch", "ubuntu", "raring", "daily", "germinate",
-            "dists", "raring", "main", "source", "Sources.gz")
+            self.temp_dir, "scratch", "ubuntu", "trusty", "daily", "germinate",
+            "dists", "trusty", "main", "source", "Sources.gz")
         self.assertTrue(os.path.exists(output_file))
         with gzip.GzipFile(output_file, "rb") as output_sources:
             self.assertEqual(
@@ -179,27 +172,19 @@
         ], self.germination.germinate_dists)
 
     def test_germinate_dists_no_proposed(self):
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.assertEqual([
-            "raring",
-            "raring-security",
-            "raring-updates",
+            "trusty",
+            "trusty-security",
+            "trusty-updates",
         ], self.germination.germinate_dists)
 
     def test_seed_dist(self):
         for project, series, seed_dist in (
-            ("ubuntu", "raring", "ubuntu.raring"),
-            ("ubuntu-server", "breezy", "ubuntu-server.breezy"),
-            ("ubuntu-server", "raring", "ubuntu.raring"),
-            ("jeos", "breezy", "jeos.breezy"),
-            ("jeos", "hardy", "ubuntu.hardy"),
-            ("ubuntukylin", "raring", "ubuntu.raring"),
-            ("ubuntukylin", "utopic", "ubuntukylin.utopic"),
-            ("ubuntu-mid", "hardy", "mobile.hardy"),
-            ("ubuntu-netbook", "maverick", "netbook.maverick"),
-            ("ubuntu-headless", "lucid", "ubuntu.lucid"),
-            ("ubuntu-moblin-remix", "hardy", "moblin.hardy"),
-            ("ubuntu-desktop-next", "utopic", "ubuntu-touch.utopic"),
+            ("ubuntu", "trusty", "ubuntu.trusty"),
+            ("ubuntu-server", "trusty", "ubuntu.trusty"),
+            ("ubuntukylin", "trusty", "ubuntu.trusty"),
+            ("ubuntukylin", "xenial", "ubuntukylin.xenial"),
         ):
             self.config["DIST"] = series
             self.assertEqual(seed_dist, self.germination.seed_dist(project))
@@ -224,13 +209,13 @@
             self.temp_dir, "germinate", "bin", "germinate")
         touch(germinate_path)
         os.chmod(germinate_path, 0o755)
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
 
-        output_dir = "%s/scratch/ubuntu/raring/daily/germinate" % self.temp_dir
+        output_dir = "%s/scratch/ubuntu/trusty/daily/germinate" % self.temp_dir
         expected_files = []
 
-        for dist in "raring", "raring-security", "raring-updates":
+        for dist in "trusty", "trusty-security", "trusty-updates":
             for suffix in (
                 "binary-amd64/Packages.gz",
                 "source/Sources.gz",
@@ -257,8 +242,8 @@
             "--seed-source",
             "https://git.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/",
             "--mirror", "file://%s/" % output_dir,
-            "--seed-dist", "ubuntu.raring",
-            "--dist", "raring,raring-security,raring-updates",
+            "--seed-dist", "ubuntu.trusty",
+            "--dist", "trusty,trusty-security,trusty-updates",
             "--arch", "amd64",
             "--components", "main",
             "--no-rdepends",
@@ -272,19 +257,19 @@
     @mock.patch("cdimage.germinate.Germination.germinate_arch")
     def test_germinate_project(self, mock_germinate_arch):
         self.config.root = self.use_temp_dir()
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["ARCHES"] = "amd64 i386"
         self.config["IMAGE_TYPE"] = "daily"
         self.capture_logging()
         self.germination.germinate_project("ubuntu")
         self.assertTrue(os.path.isdir(os.path.join(
-            self.temp_dir, "scratch", "ubuntu", "raring", "daily",
+            self.temp_dir, "scratch", "ubuntu", "trusty", "daily",
             "germinate")))
         mock_germinate_arch.assert_has_calls(
             [mock.call("ubuntu", "amd64"), mock.call("ubuntu", "i386")])
         self.assertLogEqual([
-            "Germinating for raring/amd64 ...",
-            "Germinating for raring/i386 ...",
+            "Germinating for trusty/amd64 ...",
+            "Germinating for trusty/i386 ...",
         ])
 
     @mock.patch("cdimage.germinate.Germination.germinate_project")
@@ -367,45 +352,6 @@
             ["usb-ship-live", ["usb-langsupport"]],
         ])
 
-    def write_ubuntu_hoary_structure(self):
-        """Write the Ubuntu 5.04 STRUCTURE file."""
-        self.write_structure([
-            ["base", []],
-            ["desktop", ["base"]],
-            ["ship", ["base", "desktop"]],
-            ["live", ["base", "desktop"]],
-            ["installer", []],
-            ["casper", []],
-            ["supported", ["base", "desktop", "ship", "live"]],
-        ])
-
-    def write_ubuntu_breezy_structure(self):
-        """Write the Ubuntu 5.10 STRUCTURE file."""
-        self.write_structure([
-            ["minimal", []],
-            ["standard", ["minimal"]],
-            ["desktop", ["minimal", "standard"]],
-            ["ship", ["minimal", "standard", "desktop"]],
-            ["live", ["minimal", "standard", "desktop"]],
-            ["installer", []],
-            ["casper", []],
-            ["supported", ["minimal", "standard", "desktop", "ship", "live"]],
-        ])
-
-    def write_ubuntu_dapper_structure(self):
-        """Write a reduced version of the Ubuntu 6.06 LTS STRUCTURE file."""
-        self.write_structure([
-            ["minimal", []],
-            ["boot", []],
-            ["standard", ["minimal"]],
-            ["desktop", ["minimal", "standard"]],
-            ["server", ["boot", "minimal", "standard"]],
-            ["ship", ["boot", "minimal", "standard", "desktop"]],
-            ["live", ["minimal", "standard", "desktop"]],
-            ["ship-live", ["boot", "minimal", "standard", "desktop", "live"]],
-            ["installer", []],
-        ])
-
     def write_kubuntu_structure(self):
         """Write a reduced version of the Kubuntu STRUCTURE file.
 
@@ -471,7 +417,7 @@
         self.write_ubuntu_structure()
         output = GerminateOutput(self.config, self.temp_dir)
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         expected = [
             "boot", "installer", "required", "minimal", "standard",
             "desktop-common", "desktop", "d-i-requirements", "ship",
@@ -487,16 +433,6 @@
         self.config["PROJECT"] = "ubuntu-server"
         expected = [
             "boot", "installer", "required", "minimal", "standard",
-            "desktop-common", "desktop", "d-i-requirements", "ship",
-        ]
-        for series in all_series[:3]:
-            self.config["DIST"] = series
-            self.assertEqual(expected, list(output.list_seeds("tasks")))
-        expected = ["required", "minimal", "standard", "server"]
-        self.config["DIST"] = all_series[3]
-        self.assertEqual(expected, list(output.list_seeds("tasks")))
-        expected = [
-            "boot", "installer", "required", "minimal", "standard",
             "dns-server", "lamp-server", "openssh-server", "print-server",
             "samba-server", "postgresql-server", "mail-server", "server",
             "tomcat-server", "virt-host", "d-i-requirements", "server-ship",
@@ -509,7 +445,7 @@
         self.write_ubuntu_structure()
         output = GerminateOutput(self.config, self.temp_dir)
         self.config["PROJECT"] = "ubuntu-server"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["CDIMAGE_SQUASHFS_BASE"] = "1"
         expected = [
             "boot", "installer", "standard", "dns-server", "lamp-server",
@@ -523,7 +459,7 @@
         self.write_kubuntu_structure()
         output = GerminateOutput(self.config, self.temp_dir)
         self.config["PROJECT"] = "kubuntu-active"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         expected = [
             "boot", "installer", "required", "minimal", "standard",
             "desktop-common", "desktop", "d-i-requirements", "ship",
@@ -531,44 +467,17 @@
         ]
         self.assertEqual(expected, list(output.list_seeds("tasks")))
 
-    def test_list_seeds_tasks_jeos(self):
-        self.write_structure([
-            ["required", []],
-            ["minimal", ["required"]],
-            ["jeos", ["minimal"]],
-        ])
-        output = GerminateOutput(self.config, self.temp_dir)
-        self.config["PROJECT"] = "jeos"
-        self.assertEqual(
-            ["required", "minimal", "jeos"], list(output.list_seeds("tasks")))
-
     def test_list_seeds_installer(self):
-        self.write_ubuntu_breezy_structure()
         self.write_structure([["installer", []], ["casper", []]])
         output = GerminateOutput(self.config, self.temp_dir)
         self.config["CDIMAGE_INSTALL_BASE"] = "1"
         self.assertEqual(["installer"], list(output.list_seeds("installer")))
         del self.config["CDIMAGE_INSTALL_BASE"]
         self.config["CDIMAGE_LIVE"] = "1"
-        self.config["DIST"] = "hoary"
-        self.assertEqual(["casper"], list(output.list_seeds("installer")))
-        self.config["DIST"] = "breezy"
-        self.assertEqual(["casper"], list(output.list_seeds("installer")))
-        self.config["DIST"] = "dapper"
+        self.config["DIST"] = "precise"
         self.assertEqual([], list(output.list_seeds("installer")))
 
     def test_list_seeds_debootstrap(self):
-        self.write_ubuntu_hoary_structure()
-        output = GerminateOutput(self.config, self.temp_dir)
-        for series in all_series[:2]:
-            self.config["DIST"] = series
-            self.assertEqual(["base"], list(output.list_seeds("debootstrap")))
-        self.write_ubuntu_breezy_structure()
-        output = GerminateOutput(self.config, self.temp_dir)
-        for series in all_series[2:6]:
-            self.config["DIST"] = series
-            self.assertEqual(
-                ["minimal"], list(output.list_seeds("debootstrap")))
         self.write_ubuntu_structure()
         output = GerminateOutput(self.config, self.temp_dir)
         for series in all_series[6:]:
@@ -578,23 +487,6 @@
                 list(output.list_seeds("debootstrap")))
 
     def test_list_seeds_base(self):
-        self.write_ubuntu_hoary_structure()
-        output = GerminateOutput(self.config, self.temp_dir)
-        for series in all_series[:2]:
-            self.config["DIST"] = series
-            self.assertEqual(["base"], list(output.list_seeds("base")))
-        self.write_ubuntu_breezy_structure()
-        output = GerminateOutput(self.config, self.temp_dir)
-        self.config["DIST"] = all_series[2]
-        self.assertEqual(
-            ["minimal", "standard"], list(output.list_seeds("base")))
-        self.write_ubuntu_dapper_structure()
-        output = GerminateOutput(self.config, self.temp_dir)
-        for series in all_series[3:6]:
-            self.config["DIST"] = series
-            self.assertEqual(
-                ["boot", "minimal", "standard"],
-                list(output.list_seeds("base")))
         self.write_ubuntu_structure()
         output = GerminateOutput(self.config, self.temp_dir)
         for series in all_series[6:]:
@@ -615,7 +507,7 @@
     def write_seed_output(self, arch, seed, packages):
         """Write a simplified Germinate output file, enough for testing."""
         with mkfile(os.path.join(self.temp_dir, arch, seed)) as f:
-            why = "Ubuntu.Raring %s seed" % seed
+            why = "Ubuntu.Trusty %s seed" % seed
             pkg_len = max(len("Package"), max(map(len, packages)))
             src_len = max(len("Source"), max(map(len, packages)))
             why_len = len(why)
@@ -660,20 +552,20 @@
             "usb-ship-live",
         ], list(output.master_seeds()))
 
-    def test_master_seeds_dvd_ubuntu_raring(self):
+    def test_master_seeds_dvd_ubuntu_trusty(self):
         self.write_ubuntu_structure()
         output = GerminateOutput(self.config, self.temp_dir)
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["CDIMAGE_DVD"] = "1"
         self.assertEqual(
             ["usb-langsupport", "usb-ship-live"], list(output.master_seeds()))
 
-    def test_master_seeds_install_ubuntu_raring(self):
+    def test_master_seeds_install_ubuntu_trusty(self):
         self.write_ubuntu_structure()
         output = GerminateOutput(self.config, self.temp_dir)
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["CDIMAGE_INSTALL"] = "1"
         self.config["CDIMAGE_INSTALL_BASE"] = "1"
         self.assertEqual([
@@ -681,11 +573,11 @@
             "desktop-common", "desktop", "d-i-requirements", "ship",
         ], list(output.master_seeds()))
 
-    def test_master_seeds_live_ubuntu_raring(self):
+    def test_master_seeds_live_ubuntu_trusty(self):
         self.write_ubuntu_structure()
         output = GerminateOutput(self.config, self.temp_dir)
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["CDIMAGE_INSTALL_BASE"] = "1"
         self.config["CDIMAGE_LIVE"] = "1"
         self.assertEqual([
@@ -701,11 +593,11 @@
 
         self.write_ubuntu_structure()
         output = GerminateOutput(self.config, self.temp_dir)
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         mock_master_seeds.side_effect = side_effect
         self.assertEqual([
-            "#include <ubuntu/raring/required>",
-            "#include <ubuntu/raring/minimal>",
+            "#include <ubuntu/trusty/required>",
+            "#include <ubuntu/trusty/minimal>",
         ], list(output.master_task_entries("ubuntu")))
 
     @mock.patch(
@@ -713,18 +605,18 @@
     def test_master_task_entries_no_seeds(self, mock_master_seeds):
         self.write_ubuntu_structure()
         output = GerminateOutput(self.config, self.temp_dir)
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.assertRaises(
             NoMasterSeeds, list, output.master_task_entries("ubuntu"))
 
     def test_tasks_output_dir(self):
         self.write_ubuntu_structure()
         output = GerminateOutput(self.config, self.temp_dir)
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         self.assertEqual(
             os.path.join(
-                self.temp_dir, "scratch", "ubuntu", "raring", "daily",
+                self.temp_dir, "scratch", "ubuntu", "trusty", "daily",
                 "tasks"),
             output.tasks_output_dir("ubuntu"))
 
@@ -753,7 +645,7 @@
     def test_task_packages_squashfs(self):
         self.write_ubuntu_structure()
         self.config["PROJECT"] = "ubuntu-server"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.write_seed_output(
             "i386", "installer", ["base-installer", "bootstrap-base"])
         output = GerminateOutput(self.config, self.temp_dir)
@@ -765,26 +657,6 @@
             ["base-installer", "live-installer"],
             list(output.task_packages("i386", "installer", "installer")))
 
-    def test_task_packages_gutsy_ps3_hack(self):
-        self.write_structure([["boot", []], ["installer", []]])
-        self.write_seed_output(
-            "powerpc+ps3", "boot", ["linux-image-2.6.22-14-powerpc64-smp"])
-        self.write_seed_output(
-            "powerpc+ps3", "installer", [
-                "block-modules-2.6.22-14-powerpc-di",
-                "block-modules-2.6.22-14-powerpc64-smp-di",
-            ])
-        self.config["DIST"] = "gutsy"
-        self.config["CDIMAGE_INSTALL_BASE"] = "1"
-        output = GerminateOutput(self.config, self.temp_dir)
-        self.assertEqual(
-            ["linux-image-2.6.22-14-cell"],
-            list(output.task_packages("powerpc+ps3", "boot", "boot")))
-        self.assertEqual(
-            ["block-modules-2.6.22-14-cell-di"],
-            list(output.task_packages(
-                "powerpc+ps3", "installer", "installer")))
-
     def test_task_packages_precise_kernels(self):
         self.write_structure([["boot", []], ["installer", []]])
         self.write_seed_output(
@@ -812,7 +684,7 @@
     def test_initrd_packages(self):
         self.write_ubuntu_structure()
         manifest_path = os.path.join(
-            self.temp_dir, "ftp", "dists", "raring", "main", "installer-i386",
+            self.temp_dir, "ftp", "dists", "trusty", "main", "installer-i386",
             "current", "images", "MANIFEST.udebs")
         with mkfile(manifest_path) as manifest:
             print(dedent("""\
@@ -822,7 +694,7 @@
                 netboot/netboot.tar.gz
                 \tdownload-installer 1.32ubuntu1 all
                 \tnet-retriever 1.32ubuntu1 i386"""), file=manifest)
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         output = GerminateOutput(self.config, self.temp_dir)
         self.assertEqual(
             set(["anna", "cdrom-detect"]),
@@ -835,7 +707,7 @@
     def test_common_initrd_packages(self):
         self.write_ubuntu_structure()
         manifest_path = os.path.join(
-            self.temp_dir, "ftp", "dists", "raring", "main", "installer-i386",
+            self.temp_dir, "ftp", "dists", "trusty", "main", "installer-i386",
             "current", "images", "MANIFEST.udebs")
         with mkfile(manifest_path) as manifest:
             print(dedent("""\
@@ -845,7 +717,7 @@
                 netboot/netboot.tar.gz
                 \tanna 1.45ubuntu1 i386
                 \tnet-retriever 1.32ubuntu1 i386"""), file=manifest)
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         output = GerminateOutput(self.config, self.temp_dir)
         self.assertEqual(set(["anna"]), output.common_initrd_packages("i386"))
 
@@ -870,8 +742,6 @@
         self.assertEqual(expected, output.task_headers("i386", "desktop"))
         self.assertEqual({}, output.task_headers("i386", "missing"))
 
-    # TODO: seed_task_mapping <= gutsy untested
-
     def test_seed_task_mapping(self):
         self.write_ubuntu_structure()
         seed_dir = os.path.join(self.temp_dir, "i386")
@@ -881,7 +751,7 @@
             print(dedent("""\
                 Task-Per-Derivative: 1
                 Task-Seeds: desktop-common"""), file=seedtext)
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         output = GerminateOutput(self.config, self.temp_dir)
         expected = [
             (["standard"], "standard"),
@@ -906,14 +776,14 @@
                 print("Task-Per-Derivative: 1", file=seedtext)
             with mkfile(os.path.join(seed_dir, "live.seedtext")) as seedtext:
                 print("Task-Per-Derivative: 1", file=seedtext)
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["ARCHES"] = "amd64 i386"
         self.config["IMAGE_TYPE"] = "daily-live"
         self.config["CDIMAGE_LIVE"] = "1"
         output = GerminateOutput(self.config, self.temp_dir)
         output.write_tasks_project("ubuntu")
         output_dir = os.path.join(
-            self.temp_dir, "scratch", "ubuntu", "raring", "daily-live",
+            self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live",
             "tasks")
         self.assertCountEqual([
             "required", "minimal", "desktop", "live",
@@ -990,7 +860,7 @@
         with open(os.path.join(output_dir, "important.i386")) as f:
             self.assertEqual("adduser-i386\nbase-files-i386\n", f.read())
         with open(os.path.join(output_dir, "MASTER")) as f:
-            self.assertEqual("#include <ubuntu/raring/ship-live>\n", f.read())
+            self.assertEqual("#include <ubuntu/trusty/ship-live>\n", f.read())
 
     # TODO: write_tasks untested
 
@@ -998,10 +868,10 @@
     def test_diff_tasks(self, mock_call):
         self.write_ubuntu_structure()
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily-live"
         output_dir = os.path.join(
-            self.temp_dir, "scratch", "ubuntu", "raring", "daily-live",
+            self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live",
             "tasks")
         touch(os.path.join(output_dir, "required"))
         touch(os.path.join(output_dir, "minimal"))
@@ -1026,10 +896,10 @@
     def test_update_tasks_no_mail(self, mock_diff_tasks):
         self.write_ubuntu_structure()
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily-live"
         output_dir = os.path.join(
-            self.temp_dir, "scratch", "ubuntu", "raring", "daily-live",
+            self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live",
             "tasks")
         touch(os.path.join(output_dir, "required"))
         touch(os.path.join(output_dir, "minimal"))
@@ -1039,7 +909,7 @@
             ["required", "minimal"],
             os.listdir(os.path.join(
                 self.temp_dir, "debian-cd", "tasks", "auto", "daily-live",
-                "ubuntu", "raring")))
+                "ubuntu", "trusty")))
         self.assertCountEqual(
             ["required", "minimal"], os.listdir("%s-previous" % output_dir))
 
@@ -1048,7 +918,7 @@
     def test_update_tasks_no_recipients(self, mock_diff_tasks, mock_send_mail):
         self.write_ubuntu_structure()
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily-live"
         output = GerminateOutput(self.config, self.temp_dir)
         os.makedirs(output.tasks_output_dir("ubuntu"))
@@ -1093,10 +963,10 @@
         self.write_ubuntu_structure()
         self.config["PROJECT"] = "ubuntu"
         self.config["CAPPROJECT"] = "Ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily-live"
         output_dir = os.path.join(
-            self.temp_dir, "scratch", "ubuntu", "raring", "daily-live",
+            self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live",
             "tasks")
         touch(os.path.join(output_dir, "required"))
         touch(os.path.join(output_dir, "minimal"))
@@ -1114,7 +984,7 @@
         with open(os.path.join(self.temp_dir, "mail")) as mail:
             self.assertEqual(dedent("""\
                 To: [e-mail]
-                Subject: Task changes for Ubuntu daily-live/raring on 20130319
+                Subject: Task changes for Ubuntu daily-live/trusty on 20130319
                 X-Generated-By: update-tasks
 
                 --- minimal
 
=== modified file 'lib/cdimage/tests/test_livefs.py'
--- lib/cdimage/tests/test_livefs.py	2018-12-12 20:29:20 +0000
+++ lib/cdimage/tests/test_livefs.py	2019-03-07 16:20:18 +0000
@@ -173,48 +173,26 @@
     def test_project_livecd_base(self):
         self.assertProjectEqual("base", "livecd-base", "dapper")
 
-    def test_project_tocd3_1(self):
-        self.assertProjectEqual("tocd", "tocd3.1", "breezy")
-
-    def test_project_ubuntu_touch_custom(self):
-        self.assertProjectEqual("ubuntu-touch", "ubuntu-touch-custom", "vivid")
-
     def test_ubuntu_dvd(self):
-        for series in all_series[:7]:
-            self.assertProjectEqual(
-                "ubuntu", "ubuntu", series, cdimage_dvd="1")
         for series in all_series[7:]:
             self.assertProjectEqual(
                 "ubuntu-dvd", "ubuntu", series, cdimage_dvd="1")
 
     def test_kubuntu_dvd(self):
-        for series in all_series[:7]:
-            self.assertProjectEqual(
-                "kubuntu", "kubuntu", series, cdimage_dvd="1")
         for series in all_series[7:]:
             self.assertProjectEqual(
                 "kubuntu-dvd", "kubuntu", series, cdimage_dvd="1")
 
     def test_edubuntu_dvd(self):
-        for series in all_series[:10]:
-            self.assertProjectEqual(
-                "edubuntu", "edubuntu", series, cdimage_dvd="1")
         for series in all_series[10:]:
             self.assertProjectEqual(
                 "edubuntu-dvd", "edubuntu", series, cdimage_dvd="1")
 
     def test_ubuntustudio_dvd(self):
-        for series in all_series[:15]:
-            self.assertProjectEqual(
-                "ubuntustudio", "ubuntustudio", series, cdimage_dvd="1")
         for series in all_series[15:]:
             self.assertProjectEqual(
                 "ubuntustudio-dvd", "ubuntustudio", series, cdimage_dvd="1")
 
-    def test_lpia(self):
-        self.assertProjectEqual("ubuntu-lpia", "ubuntu", "hardy", arch="lpia")
-        self.assertProjectEqual("ubuntu", "ubuntu", "intrepid", arch="lpia")
-
 
 def make_livefs_production_config(config):
     config_path = os.path.join(config.root, "production", "livefs-builders")
@@ -233,8 +211,6 @@
             *\t\t*\t\thppa\t\t\tcastilla.buildd
             *\t\t*\t\ti386\t\t\tcardamom.buildd
             *\t\t*\t\tia64\t\t\tweddell.buildd
-            *\t\t-hardy\t\tlpia\t\t\tcardamom.buildd
-            *\t\t*\t\tlpia\t\t\tconcordia.buildd
             *\t\t*\t\tpowerpc\t\t\troyal.buildd
             *\t\t*\t\tppc64el\t\t\tfisher01.buildd
             *\t\t*\t\tsparc\t\t\tvivies.buildd
@@ -297,12 +273,6 @@
         for series in all_series:
             self.assertBuilderEqual("weddell.buildd", "ia64", series)
 
-    def test_lpia(self):
-        for series in all_series[:8]:
-            self.assertBuilderEqual("cardamom.buildd", "lpia", series)
-        for series in all_series[8:]:
-            self.assertBuilderEqual("concordia.buildd", "lpia", series)
-
     def test_powerpc(self):
         for series in all_series:
             self.assertBuilderEqual("royal.buildd", "powerpc", series)
@@ -364,16 +334,11 @@
         self.assertEqual(
             ["-f", "plain"], live_build_options(self.config, "armhf"))
 
-    def test_ubuntu_touch_custom(self):
-        self.config["PROJECT"] = "ubuntu-touch-custom"
-        self.assertEqual(
-            ["-f", "plain"], live_build_options(self.config, "armhf"))
-
     def test_wubi(self):
         self.config["SUBPROJECT"] = "wubi"
         for series, fstype in (
             ("precise", "ext3"),
-            ("quantal", "ext3"),  # ext4
+            ("trusty", "ext3"),  # ext4
         ):
             self.config["DIST"] = series
             self.assertEqual(
@@ -405,10 +370,10 @@
 
     def test_basic(self):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         expected = self.base_expected + [
             "[e-mail]", "/home/buildd/bin/BuildLiveCD",
-            "-l", "-A", "i386", "-d", "raring", "ubuntu",
+            "-l", "-A", "i386", "-d", "trusty", "ubuntu",
         ]
         self.assertEqual(expected, live_build_command(self.config, "i386"))
 
@@ -417,8 +382,8 @@
         self.assertCommandContains(["-u", "zh_CN"], "i386")
 
     def test_pre_live_build(self):
-        self.config["DIST"] = "natty"
-        self.assertNotIn("-l", live_build_command(self.config, "i386"))
+        self.config["DIST"] = "precise"
+        self.assertIn("-l", live_build_command(self.config, "i386"))
 
     @mock.patch(
         "cdimage.livefs.live_build_options", return_value=["-f", "plain"])
@@ -506,21 +471,21 @@
     def test_live_build_notify_failure_no_log(self, mock_send_mail, *args):
         self.config.root = self.use_temp_dir()
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         path = os.path.join(self.temp_dir, "production", "notify-addresses")
         with mkfile(path) as notify_addresses:
             print("ALL\[e-mail]", file=notify_addresses)
         live_build_notify_failure(self.config, "i386")
         mock_send_mail.assert_called_once_with(
-            "LiveFS ubuntu/raring/i386 failed to build on 20130315",
+            "LiveFS ubuntu/trusty/i386 failed to build on 20130315",
             "buildlive", ["[e-mail]"], b"")
 
     @mock.patch("time.strftime", return_value="20130315")
     @mock.patch("cdimage.livefs.send_mail")
     def test_live_build_notify_failure_log(self, mock_send_mail, *args):
         self.config["PROJECT"] = "kubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         path = os.path.join(self.temp_dir, "production", "notify-addresses")
         with mkfile(path) as notify_addresses:
@@ -529,10 +494,10 @@
         with mock.patch("cdimage.livefs.urlopen", mock_urlopen_obj):
             live_build_notify_failure(self.config, "armhf+omap4")
         mock_urlopen_obj.assert_called_once_with(
-            "http://kishi00.buildd/~buildd/LiveCD/raring/kubuntu-omap4/latest/"
+            "http://kishi00.buildd/~buildd/LiveCD/trusty/kubuntu-omap4/latest/"
             "livecd-armhf.out", timeout=30)
         mock_send_mail.assert_called_once_with(
-            "LiveFS kubuntu-omap4/raring/armhf+omap4 failed to build on "
+            "LiveFS kubuntu-omap4/trusty/armhf+omap4 failed to build on "
             "20130315",
             "buildlive", ["[e-mail]"], b"Log data\n")
 
@@ -542,7 +507,7 @@
     @mock.patch("cdimage.livefs.send_mail")
     def test_run_live_builds_notifies_on_failure(self, mock_send_mail, *args):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         self.config["ARCHES"] = "amd64 i386"
         path = os.path.join(self.temp_dir, "production", "notify-addresses")
@@ -563,10 +528,10 @@
         ], self.captured_log_messages())
         mock_send_mail.assert_has_calls([
             mock.call(
-                "LiveFS ubuntu/raring/amd64 failed to build on 20130315",
+                "LiveFS ubuntu/trusty/amd64 failed to build on 20130315",
                 "buildlive", ["[e-mail]"], b"Log data\n"),
             mock.call(
-                "LiveFS ubuntu/raring/i386 failed to build on 20130315",
+                "LiveFS ubuntu/trusty/i386 failed to build on 20130315",
                 "buildlive", ["[e-mail]"], b"Log data\n"),
         ], any_order=True)
 
@@ -577,7 +542,7 @@
     def test_run_live_builds(self, mock_live_build_notify_failure, mock_popen,
                              mock_tracker_set_rebuild_status, *args):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         self.config["ARCHES"] = "amd64 i386"
         self.capture_logging()
@@ -605,12 +570,12 @@
             mock.call(
                 expected_command_base + [
                     "[e-mail]", "/home/buildd/bin/BuildLiveCD",
-                    "-l", "-A", "amd64", "-d", "raring", "ubuntu",
+                    "-l", "-A", "amd64", "-d", "trusty", "ubuntu",
                 ]),
             mock.call(
                 expected_command_base + [
                     "[e-mail]", "/home/buildd/bin/BuildLiveCD",
-                    "-l", "-A", "i386", "-d", "raring", "ubuntu",
+                    "-l", "-A", "i386", "-d", "trusty", "ubuntu",
                 ])
         ])
         self.assertEqual(0, mock_live_build_notify_failure.call_count)
@@ -622,7 +587,7 @@
                                              mock_live_build_notify_failure,
                                              mock_popen, *args):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         self.config["ARCHES"] = "amd64 amd64+mac"
         self.capture_logging()
@@ -632,7 +597,7 @@
             "ssh", "-n", "-o", "StrictHostKeyChecking=no",
             "-o", "BatchMode=yes",
             "[e-mail]", "/home/buildd/bin/BuildLiveCD",
-            "-l", "-A", "amd64", "-d", "raring", "ubuntu",
+            "-l", "-A", "amd64", "-d", "trusty", "ubuntu",
         ]
         mock_popen.assert_called_once_with(expected_command)
         self.assertEqual(0, mock_live_build_notify_failure.call_count)
@@ -643,7 +608,7 @@
     @mock.patch("cdimage.livefs.send_mail")
     def test_run_live_builds_partial_success(self, mock_send_mail, *args):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily"
         self.config["ARCHES"] = "amd64 i386"
         path = os.path.join(self.temp_dir, "production", "notify-addresses")
@@ -677,17 +642,17 @@
                 mock.call(
                     expected_command_base + [
                         "[e-mail]", "/home/buildd/bin/BuildLiveCD",
-                        "-l", "-A", "amd64", "-d", "raring", "ubuntu",
+                        "-l", "-A", "amd64", "-d", "trusty", "ubuntu",
                     ]),
                 mock.call(
                     expected_command_base + [
                         "[e-mail]",
                         "/home/buildd/bin/BuildLiveCD",
-                        "-l", "-A", "i386", "-d", "raring", "ubuntu",
+                        "-l", "-A", "i386", "-d", "trusty", "ubuntu",
                     ]),
             ])
             mock_send_mail.assert_called_once_with(
-                "LiveFS ubuntu/raring/i386 failed to build on 20130315",
+                "LiveFS ubuntu/trusty/i386 failed to build on 20130315",
                 "buildlive", ["[e-mail]"], b"Log data\n")
 
     @skipUnless(launchpad_available, "launchpadlib not available")
@@ -702,7 +667,7 @@
                                 mock_tracker_set_rebuild_status, mock_sleep,
                                 *args):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "utopic"
+        self.config["DIST"] = "xenial"
         self.config["IMAGE_TYPE"] = "daily"
         self.config["ARCHES"] = "amd64 i386"
         osextras.unlink_force(os.path.join(
@@ -737,13 +702,13 @@
         lp = get_launchpad()
         owner = lp.people["ubuntu-cdimage"]
         ubuntu = lp.distributions["ubuntu"]
-        utopic = ubuntu.getSeries(name_or_version="utopic")
+        xenial = ubuntu.getSeries(name_or_version="xenial")
         dases = [
-            utopic.getDistroArchSeries(archtag)
+            xenial.getDistroArchSeries(archtag)
             for archtag in ("amd64", "i386")]
         self.assertEqual(2, len(dases))
         livefs = lp.livefses.getByName(
-            owner=owner, distro_series=utopic, name="ubuntu-desktop")
+            owner=owner, distro_series=xenial, name="ubuntu-desktop")
         builds = [
             livefs.getLatestBuild(distro_arch_series=das) for das in dases]
         self.assertEqual(2, len(builds))
@@ -844,7 +809,7 @@
 
     def test_livecd_override(self):
         self.assertBaseEqual(
-            "ftp://blah/quantal/ubuntu/current", "i386", "ubuntu", "quantal",
+            "ftp://blah/trusty/ubuntu/current", "i386", "ubuntu", "trusty",
             livecd="ftp://blah")
 
     def test_subproject(self):
@@ -861,11 +826,11 @@
 
     def test_subarch(self):
         self.assertBaseEqual(
-            self.base("royal.buildd", "ubuntu-ps3", "gutsy"),
-            "powerpc+ps3", "ubuntu", "gutsy")
+            self.base("royal.buildd", "ubuntu-ps3", "precise"),
+            "powerpc+ps3", "ubuntu", "precise")
         self.assertBaseEqual(
-            self.base("celbalrai.buildd", "ubuntu-server-omap", "oneiric"),
-            "armel+omap", "ubuntu-server", "oneiric")
+            self.base("celbalrai.buildd", "ubuntu-server-omap", "precise"),
+            "armel+omap", "ubuntu-server", "precise")
 
     def test_ubuntu_defaults_locale(self):
         for series in all_series:
@@ -882,9 +847,6 @@
         self.assertEqual(expected.split(), flavours(config, arch))
 
     def test_amd64(self):
-        for series in all_series[:4]:
-            self.assertFlavoursEqual(
-                "amd64-generic", "amd64", "ubuntu", series)
         for series in all_series[4:]:
             self.assertFlavoursEqual(
                 "generic", "amd64", "ubuntu", series)
@@ -893,12 +855,11 @@
                 "lowlatency", "amd64", "ubuntustudio", series)
 
     def test_armel(self):
-        self.assertFlavoursEqual("imx51", "armel+imx51", "ubuntu", "jaunty")
-        self.assertFlavoursEqual("imx51", "armel+omap", "ubuntu", "jaunty")
         for series in all_series[10:]:
             self.assertFlavoursEqual(
                 "linaro-lt-mx5", "armel+mx5", "ubuntu", series)
             self.assertFlavoursEqual("omap", "armel+omap", "ubuntu", series)
+            self.assertFlavoursEqual("imx51", "armel+imx51", "ubuntu", series)
 
     def test_armhf(self):
         for series in all_series:
@@ -911,11 +872,8 @@
             self.assertFlavoursEqual("hppa32 hppa64", "hppa", "ubuntu", series)
 
     def test_i386(self):
-        for series in all_series[:4]:
-            self.assertFlavoursEqual("i386", "i386", "ubuntu", series)
-        for series in all_series[4:15] + all_series[17:]:
+        for series in all_series[4:]:
             self.assertFlavoursEqual("generic", "i386", "ubuntu", series)
-        self.assertFlavoursEqual("generic", "i386", "ubuntu", "precise")
         for series in all_series[4:]:
             self.assertFlavoursEqual("generic", "i386", "xubuntu", series)
             self.assertFlavoursEqual("generic", "i386", "lubuntu", series)
@@ -926,33 +884,18 @@
                 "lowlatency", "i386", "ubuntustudio", series)
 
     def test_ia64(self):
-        for series in all_series[:4]:
-            self.assertFlavoursEqual(
-                "itanium-smp mckinley-smp", "ia64", "ubuntu", series)
-        for series in all_series[4:10]:
-            self.assertFlavoursEqual(
-                "itanium mckinley", "ia64", "ubuntu", series)
         for series in all_series[10:]:
             self.assertFlavoursEqual("ia64", "ia64", "ubuntu", series)
 
-    def test_lpia(self):
-        for series in all_series:
-            self.assertFlavoursEqual("lpia", "lpia", "ubuntu", series)
-
     def test_powerpc(self):
-        for series in all_series[:15]:
-            self.assertFlavoursEqual(
-                "powerpc powerpc64-smp", "powerpc", "ubuntu", series)
         for series in all_series[15:24]:
             self.assertFlavoursEqual(
                 "powerpc-smp powerpc64-smp", "powerpc", "ubuntu", series)
         for series in all_series[24:]:
             self.assertFlavoursEqual(
                 "powerpc-smp generic", "powerpc", "ubuntu", series)
-        self.assertFlavoursEqual("cell", "powerpc+ps3", "ubuntu", "gutsy")
-        for series in all_series[7:15]:
-            self.assertFlavoursEqual(
-                "powerpc powerpc64-smp", "powerpc+ps3", "ubuntu", "hardy")
+        self.assertFlavoursEqual(
+            "powerpc-smp powerpc64-smp", "powerpc+ps3", "ubuntu", "precise")
 
     def test_ppc64el(self):
         for series in all_series:
@@ -985,20 +928,6 @@
         self.config["DIST"] = series
         self.assertEqual([], list(live_item_paths(self.config, arch, item)))
 
-    def test_tocd3_fallback(self):
-        for item in ("cloop", "manifest"):
-            self.assertPathsEqual(
-                ["/home/cjwatson/tocd3/livecd.tocd3.%s" % item],
-                "i386", item, "tocd3", "hoary")
-
-    def test_ubuntu_breezy_fallback(self):
-        for item in ("cloop", "manifest"):
-            for arch in ("amd64", "i386", "powerpc"):
-                self.assertPathsEqual(
-                    ["/home/cjwatson/breezy-live/ubuntu/livecd.%s.%s" %
-                     (arch, item)],
-                    arch, item, "ubuntu", "breezy")
-
     def test_desktop_items(self):
         for item in (
             "cloop", "squashfs", "manifest", "manifest-desktop",
@@ -1019,14 +948,14 @@
     def test_imgxz(self):
         for item in ("img.xz", "model-assertion"):
             self.assertPathsEqual(
-                ["http://kapok.buildd/~buildd/LiveCD/artful/ubuntu-core/"
+                ["http://kapok.buildd/~buildd/LiveCD/xenial/ubuntu-core/"
                  "current/livecd.ubuntu-core.%s" % item],
-                "amd64", item, "ubuntu-core", "artful")
+                "amd64", item, "ubuntu-core", "xenial")
             self.assertPathsEqual(
-                ["http://kishi00.buildd/~buildd/LiveCD/artful/"
+                ["http://kishi00.buildd/~buildd/LiveCD/xenial/"
                  "ubuntu-core-raspi2/current/"
                  "livecd.ubuntu-core-raspi2.%s" % item],
-                "armhf+raspi2", item, "ubuntu-core", "artful")
+                "armhf+raspi2", item, "ubuntu-core", "xenial")
 
     def test_kernel_items(self):
         for item in ("kernel", "initrd", "bootimg"):
@@ -1035,14 +964,14 @@
                 ["%s/livecd.kubuntu.%s-generic" % (root, item),
                  "%s/livecd.kubuntu.%s-generic-hwe" % (root, item)],
                 "amd64", item, "kubuntu", "precise")
-            root = ("http://royal.buildd/~buildd/LiveCD/hardy/ubuntu-ps3/"
+            root = ("http://royal.buildd/~buildd/LiveCD/precise/ubuntu-ps3/"
                     "current")
             self.assertPathsEqual(
-                ["%s/livecd.ubuntu-ps3.%s-powerpc" % (root, item),
+                ["%s/livecd.ubuntu-ps3.%s-powerpc-smp" % (root, item),
                  "%s/livecd.ubuntu-ps3.%s-powerpc64-smp" % (root, item),
-                 "%s/livecd.ubuntu-ps3.%s-powerpc-hwe" % (root, item),
+                 "%s/livecd.ubuntu-ps3.%s-powerpc-smp-hwe" % (root, item),
                  "%s/livecd.ubuntu-ps3.%s-powerpc64-smp-hwe" % (root, item)],
-                "powerpc+ps3", item, "ubuntu", "hardy")
+                "powerpc+ps3", item, "ubuntu", "precise")
 
     def test_kernel_efi_signed(self):
         self.assertNoPaths("i386", "kernel-efi-signed", "ubuntu", "quantal")
@@ -1056,21 +985,7 @@
             ["%s/livecd.ubuntu.kernel-generic.efi.signed" % root],
             "amd64", "kernel-efi-signed", "ubuntu", "quantal")
 
-    # TODO: Since this is only of historical interest, we only test a small
-    # number of cases at the moment.
-    def test_winfoss(self):
-        self.assertNoPaths("i386", "winfoss", "ubuntu", "warty")
-        self.assertNoPaths("powerpc", "winfoss", "ubuntu", "hardy")
-        self.assertPathsEqual(
-            ["http://people.canonical.com/~henrik/winfoss/gutsy/"
-             "ubuntu/current/ubuntu-winfoss-7.10.tar.gz"],
-            "i386", "winfoss", "ubuntu", "karmic")
-        self.assertNoPaths("i386", "winfoss", "ubuntu", "precise")
-
     def test_wubi(self):
-        for series in all_series[:6]:
-            self.assertNoPaths("amd64", "wubi", "ubuntu", series)
-            self.assertNoPaths("i386", "wubi", "ubuntu", series)
         for series in all_series[6:]:
             path = ("http://people.canonical.com/~ubuntu-archive/wubi/%s/"
                     "stable" % series)
@@ -1079,15 +994,6 @@
         self.assertNoPaths("i386", "wubi", "xubuntu", "precise")
         self.assertNoPaths("powerpc", "wubi", "ubuntu", "precise")
 
-    def test_umenu(self):
-        for series in all_series[:7] + all_series[8:]:
-            self.assertNoPaths("amd64", "umenu", "ubuntu", series)
-            self.assertNoPaths("i386", "umenu", "ubuntu", series)
-        path = "http://people.canonical.com/~evand/umenu/stable"
-        self.assertPathsEqual([path], "amd64", "umenu", "ubuntu", "hardy")
-        self.assertPathsEqual([path], "i386", "umenu", "ubuntu", "hardy")
-        self.assertNoPaths("powerpc", "umenu", "ubuntu", "hardy")
-
     def test_usb_creator(self):
         for series in all_series:
             path = ("http://people.canonical.com/~evand/usb-creator/%s/"
@@ -1118,49 +1024,50 @@
 
     def test_live_output_directory(self):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily-live"
         expected = os.path.join(
-            self.temp_dir, "scratch", "ubuntu", "raring", "daily-live", "live")
+            self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live", "live")
         self.assertEqual(expected, live_output_directory(self.config))
         self.config["UBUNTU_DEFAULTS_LOCALE"] = "zh_CN"
         expected = os.path.join(
-            self.temp_dir, "scratch", "ubuntu-zh_CN", "raring", "daily-live",
+            self.temp_dir, "scratch", "ubuntu-zh_CN", "trusty", "daily-live",
             "live")
         self.assertEqual(expected, live_output_directory(self.config))
 
     @mock.patch("cdimage.osextras.fetch")
     def test_download_live_items_no_item(self, mock_fetch):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily-live"
-        self.assertFalse(download_live_items(self.config, "powerpc", "umenu"))
+        self.assertFalse(download_live_items(self.config, "powerpc",
+                         "usb-creator"))
         self.assertEqual(0, mock_fetch.call_count)
 
     @mock.patch("cdimage.osextras.fetch", side_effect=osextras.FetchError)
     def test_download_live_items_failed_fetch(self, mock_fetch):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily-live"
         self.assertFalse(download_live_items(self.config, "i386", "squashfs"))
         mock_fetch.assert_called_once_with(
             self.config,
-            "http://cardamom.buildd/~buildd/LiveCD/raring/ubuntu/current/"
+            "http://cardamom.buildd/~buildd/LiveCD/trusty/ubuntu/current/"
             "livecd.ubuntu.squashfs",
             os.path.join(
-                self.temp_dir, "scratch", "ubuntu", "raring", "daily-live",
+                self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live",
                 "live", "i386.squashfs"))
 
     @mock.patch("cdimage.osextras.fetch")
     def test_download_live_items_kernel(self, mock_fetch):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "quantal"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily-live"
         self.assertTrue(download_live_items(self.config, "powerpc", "kernel"))
-        prefix = ("http://royal.buildd/~buildd/LiveCD/quantal/ubuntu/current/"
+        prefix = ("http://royal.buildd/~buildd/LiveCD/trusty/ubuntu/current/"
                   "livecd.ubuntu.kernel-")
         target_dir = os.path.join(
-            self.temp_dir, "scratch", "ubuntu", "quantal", "daily-live",
+            self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live",
             "live")
         mock_fetch.assert_has_calls([
             mock.call(
@@ -1204,15 +1111,15 @@
     @mock.patch("cdimage.osextras.fetch")
     def test_download_live_items_initrd(self, mock_fetch):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily-live"
         self.assertTrue(download_live_items(self.config, "i386", "kernel"))
-        prefix = ("http://cardamom.buildd/~buildd/LiveCD/raring/ubuntu/"
+        prefix = ("http://cardamom.buildd/~buildd/LiveCD/trusty/ubuntu/"
                   "current/livecd.ubuntu.kernel-")
         calls = []
         for suffix in '', '-hwe':
             target_dir = os.path.join(
-                self.temp_dir, "scratch", "ubuntu", "raring", "daily-live",
+                self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live",
                 "live")
             calls.append(
                 mock.call(
@@ -1223,14 +1130,14 @@
     @mock.patch("cdimage.osextras.fetch")
     def test_download_live_items_kernel_efi_signed(self, mock_fetch):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily-live"
         self.assertTrue(
             download_live_items(self.config, "amd64", "kernel-efi-signed"))
-        prefix = ("http://kapok.buildd/~buildd/LiveCD/raring/ubuntu/"
+        prefix = ("http://kapok.buildd/~buildd/LiveCD/trusty/ubuntu/"
                   "current/livecd.ubuntu.kernel-")
         target_dir = os.path.join(
-            self.temp_dir, "scratch", "ubuntu", "raring", "daily-live", "live")
+            self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live", "live")
         mock_fetch.assert_called_once_with(
             self.config, prefix + "generic.efi.signed",
             os.path.join(target_dir, "amd64.kernel-generic.efi.signed"))
@@ -1238,16 +1145,16 @@
     @mock.patch("cdimage.osextras.fetch")
     def test_download_live_items_bootimg(self, mock_fetch):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily-preinstalled"
         self.assertTrue(
             download_live_items(self.config, "armhf+omap4", "bootimg"))
-        url = ("http://kishi00.buildd/~buildd/LiveCD/raring/ubuntu-omap4/"
+        url = ("http://kishi00.buildd/~buildd/LiveCD/trusty/ubuntu-omap4/"
                "current/livecd.ubuntu-omap4.bootimg-omap4")
         calls = []
         for suffix in '', '-hwe':
             target_dir = os.path.join(
-                self.temp_dir, "scratch", "ubuntu", "raring",
+                self.temp_dir, "scratch", "ubuntu", "trusty",
                 "daily-preinstalled", "live")
             calls.append(
                 mock.call(
@@ -1259,77 +1166,52 @@
     @mock.patch("cdimage.osextras.fetch")
     def test_download_live_items_wubi(self, mock_fetch):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily-live"
         self.assertTrue(download_live_items(self.config, "i386", "wubi"))
-        url = "http://people.canonical.com/~ubuntu-archive/wubi/raring/stable"
+        url = "http://people.canonical.com/~ubuntu-archive/wubi/trusty/stable"
         target_dir = os.path.join(
-            self.temp_dir, "scratch", "ubuntu", "raring", "daily-live", "live")
+            self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live", "live")
         mock_fetch.assert_called_once_with(
             self.config, url, os.path.join(target_dir, "i386.wubi.exe"))
 
     @mock.patch("cdimage.osextras.fetch")
-    def test_download_live_items_umenu(self, mock_fetch):
-        self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "hardy"
-        self.config["IMAGE_TYPE"] = "daily-live"
-        self.assertTrue(download_live_items(self.config, "i386", "umenu"))
-        url = "http://people.canonical.com/~evand/umenu/stable"
-        target_dir = os.path.join(
-            self.temp_dir, "scratch", "ubuntu", "hardy", "daily-live", "live")
-        mock_fetch.assert_called_once_with(
-            self.config, url, os.path.join(target_dir, "i386.umenu.exe"))
-
-    @mock.patch("cdimage.osextras.fetch")
     def test_download_live_items_usb_creator(self, mock_fetch):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily-live"
         self.assertTrue(
             download_live_items(self.config, "i386", "usb-creator"))
-        url = "http://people.canonical.com/~evand/usb-creator/raring/stable"
+        url = "http://people.canonical.com/~evand/usb-creator/trusty/stable"
         target_dir = os.path.join(
-            self.temp_dir, "scratch", "ubuntu", "raring", "daily-live", "live")
+            self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live", "live")
         mock_fetch.assert_called_once_with(
             self.config, url, os.path.join(target_dir, "i386.usb-creator.exe"))
 
     @mock.patch("cdimage.osextras.fetch")
-    def test_download_live_items_winfoss(self, mock_fetch):
-        self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "gutsy"
-        self.config["IMAGE_TYPE"] = "daily-live"
-        self.assertTrue(download_live_items(self.config, "i386", "winfoss"))
-        url = ("http://people.canonical.com/~henrik/winfoss/gutsy/ubuntu/"
-               "current/ubuntu-winfoss-7.10.tar.gz")
-        target_dir = os.path.join(
-            self.temp_dir, "scratch", "ubuntu", "gutsy", "daily-live", "live")
-        mock_fetch.assert_called_once_with(
-            self.config, url, os.path.join(target_dir, "i386.winfoss.tgz"))
-
-    @mock.patch("cdimage.osextras.fetch")
     def test_download_live_items_squashfs(self, mock_fetch):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily-live"
         self.assertTrue(download_live_items(self.config, "i386", "squashfs"))
-        url = ("http://cardamom.buildd/~buildd/LiveCD/raring/ubuntu/"
+        url = ("http://cardamom.buildd/~buildd/LiveCD/trusty/ubuntu/"
                "current/livecd.ubuntu.squashfs")
         target_dir = os.path.join(
-            self.temp_dir, "scratch", "ubuntu", "raring", "daily-live", "live")
+            self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live", "live")
         mock_fetch.assert_called_once_with(
             self.config, url, os.path.join(target_dir, "i386.squashfs"))
 
     @mock.patch("cdimage.osextras.fetch")
     def test_download_live_items_server_squashfs(self, mock_fetch):
         self.config["PROJECT"] = "edubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "dvd"
         self.assertTrue(
             download_live_items(self.config, "i386", "server-squashfs"))
-        url = ("http://cardamom.buildd/~buildd/LiveCD/raring/ubuntu-server/"
+        url = ("http://cardamom.buildd/~buildd/LiveCD/trusty/ubuntu-server/"
                "current/livecd.ubuntu-server.squashfs")
         target_dir = os.path.join(
-            self.temp_dir, "scratch", "edubuntu", "raring", "dvd", "live")
+            self.temp_dir, "scratch", "edubuntu", "trusty", "dvd", "live")
         mock_fetch.assert_called_once_with(
             self.config, url, os.path.join(target_dir, "i386.server-squashfs"))
 
@@ -1364,6 +1246,10 @@
         self.assert_server_live_download_items(
             "bionic", "maas-region.squashfs", ["maas-region.squashfs"])
 
+    def test_download_live_items_multi_layers_squashfs(self):
+        self.assert_server_live_download_items(
+            "disco", "minimal.standard.live.squashfs", ["minimal.standard.live.squashfs"])
+
     def test_download_live_server_boot_items(self):
         self.assert_server_live_download_items(
             "bionic", "kernel",
@@ -1377,10 +1263,10 @@
 
     def test_write_autorun(self):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily-live"
         output_dir = os.path.join(
-            self.temp_dir, "scratch", "ubuntu", "raring", "daily-live", "live")
+            self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live", "live")
         os.makedirs(output_dir)
         write_autorun(self.config, "i386", "wubi.exe", "Install Ubuntu")
         autorun_path = os.path.join(output_dir, "i386.autorun.inf")
@@ -1413,13 +1299,13 @@
 
         mock_fetch.side_effect = fetch_side_effect
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.config["IMAGE_TYPE"] = "daily-live"
         self.config["ARCHES"] = "amd64 i386"
         self.config["CDIMAGE_LIVE"] = "1"
         download_live_filesystems(self.config)
         output_dir = os.path.join(
-            self.temp_dir, "scratch", "ubuntu", "raring", "daily-live", "live")
+            self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live", "live")
         self.assertCountEqual([
             "amd64.autorun.inf",
             "amd64.initrd-generic",
 
=== modified file 'lib/cdimage/tests/test_mirror.py'
--- lib/cdimage/tests/test_mirror.py	2015-12-08 13:17:26 +0000
+++ lib/cdimage/tests/test_mirror.py	2019-03-07 16:20:18 +0000
@@ -66,10 +66,6 @@
         for series in all_series:
             self.assertMirrorEqual("ftp", "i386", series)
 
-    def test_lpia(self):
-        for series in all_series:
-            self.assertMirrorEqual("ftp", "lpia", series)
-
     def test_powerpc(self):
         for series in all_series:
             self.assertMirrorEqual("ftp", "powerpc", series)
 
=== modified file 'lib/cdimage/tests/test_tree.py'
--- lib/cdimage/tests/test_tree.py	2019-03-06 20:19:33 +0000
+++ lib/cdimage/tests/test_tree.py	2019-03-07 16:20:18 +0000
@@ -247,44 +247,26 @@
 
     def test_publish_type(self):
         for image_type, project, dist, publish_type in (
-            ("daily-preinstalled", "ubuntu-netbook", "precise",
-             "preinstalled-netbook"),
-            ("daily-preinstalled", "ubuntu-headless", "precise",
-             "preinstalled-headless"),
             ("daily-preinstalled", "ubuntu-server", "precise",
              "preinstalled-server"),
             ("daily-preinstalled", "ubuntu-server", "xenial",
              "preinstalled-server"),
             ("daily-preinstalled", "ubuntu", "precise",
              "preinstalled-desktop"),
-            ("daily-preinstalled", "ubuntu-touch", "saucy",
-             "preinstalled-touch"),
-            ("daily-preinstalled", "ubuntu-touch-custom", "vivid",
-             "preinstalled-touch"),
-            ("daily-live", "edubuntu", "edgy", "live"),
-            ("daily-live", "edubuntu", "feisty", "desktop"),
-            ("daily-live", "kubuntu-netbook", "lucid", "netbook"),
-            ("daily-live", "kubuntu-plasma5", "utopic", "desktop"),
-            ("daily-live", "ubuntu-mid", "lucid", "mid"),
-            ("daily-live", "ubuntu-moblin-remix", "lucid", "moblin-remix"),
-            ("daily-live", "ubuntu-netbook", "hardy", "netbook"),
-            ("daily-live", "ubuntu-server", "hardy", "live-server"),
-            ("daily-live", "ubuntu", "breezy", "live"),
-            ("daily-live", "ubuntu", "dapper", "desktop"),
-            ("daily-live", "ubuntu-zh_CN", "raring", "desktop"),
+            ("daily-preinstalled", "ubuntu-touch", "trusty",
+             "preinstalled-touch"),
+            ("daily-live", "edubuntu", "precise", "desktop"),
+            ("daily-live", "kubuntu-netbook", "precise", "netbook"),
+            ("daily-live", "ubuntu-server", "precise", "live-server"),
+            ("daily-live", "ubuntu", "precise", "desktop"),
+            ("daily-live", "ubuntu-zh_CN", "trusty", "desktop"),
             ("daily-live", "ubuntu-core", "xenial", "live-core"),
-            ("ports_dvd", "ubuntu", "hardy", "dvd"),
-            ("dvd", "kubuntu", "hardy", "dvd"),
-            ("daily", "edubuntu", "edgy", "install"),
-            ("daily", "edubuntu", "feisty", "server"),
-            ("daily", "edubuntu", "gutsy", "server"),
-            ("daily", "edubuntu", "hardy", "addon"),
-            ("daily", "jeos", "hardy", "jeos"),
+            ("ports_dvd", "ubuntu", "precise", "dvd"),
+            ("dvd", "kubuntu", "precise", "dvd"),
+            ("daily", "edubuntu", "precise", "addon"),
             ("daily", "ubuntu-base", "precise", "base"),
-            ("daily", "ubuntu-server", "breezy", "install"),
-            ("daily", "ubuntu-server", "dapper", "server"),
-            ("daily", "ubuntu", "breezy", "install"),
-            ("daily", "ubuntu", "dapper", "alternate"),
+            ("daily", "ubuntu-server", "precise", "server"),
+            ("daily", "ubuntu", "precise", "alternate"),
         ):
             self.config["PROJECT"] = project
             self.config["DIST"] = dist
@@ -318,8 +300,6 @@
         for project, expected in (
             ("ubuntu", [assets + "/vanilla-framework-version-1.8.0.min.css"]),
             ("kubuntu", ["//releases.ubuntu.com/include/kubuntu.css"]),
-            ("kubuntu-plasma5",
-             ["//releases.ubuntu.com/include/kubuntu-plasma5.css"]),
             ("lubuntu",
              ["//cdimage.ubuntu.com/include/lubuntu/style.css"]),
             ("lubuntu-next",
@@ -330,7 +310,7 @@
             self.assertEqual(expected, publisher.cssincludes())
 
     def test_cdtypestr(self):
-        self.config["DIST"] = "quantal"
+        self.config["DIST"] = "trusty"
         publisher = Publisher(self.tree, "daily-live")
         self.assertEqual(
             "desktop image", publisher.cdtypestr("desktop", "iso"))
@@ -338,7 +318,7 @@
     def test_cdtypedesc_desktop(self):
         self.config["PROJECT"] = "ubuntu"
         self.config["CAPPROJECT"] = "Ubuntu"
-        self.config["DIST"] = "quantal"
+        self.config["DIST"] = "trusty"
         publisher = Publisher(self.tree, "daily-live")
         desc = list(publisher.cdtypedesc("desktop", "iso"))
         self.assertEqual(
@@ -358,7 +338,7 @@
     def test_cdtypedesc_alternate(self):
         self.config["PROJECT"] = "ubuntu"
         self.config["CAPPROJECT"] = "Ubuntu"
-        self.config["DIST"] = "quantal"
+        self.config["DIST"] = "trusty"
         publisher = Publisher(self.tree, "daily")
         desc = list(publisher.cdtypedesc("alternate", "iso"))
         self.assertEqual(
@@ -452,30 +432,30 @@
     def test_find_images(self):
         for name in (
             "MD5SUMS",
-            "raring-desktop-amd64.iso", "raring-desktop-amd64.list",
-            "raring-desktop-i386.iso", "raring-desktop-i386.list",
+            "trusty-desktop-amd64.iso", "trusty-desktop-amd64.list",
+            "trusty-desktop-i386.iso", "trusty-desktop-i386.list",
         ):
             touch(os.path.join(self.directory, name))
         publisher = Publisher(self.tree, "daily-live")
         self.assertCountEqual(
-            ["raring-desktop-amd64.list", "raring-desktop-i386.list"],
-            publisher.find_images(self.directory, "raring", "desktop"))
+            ["trusty-desktop-amd64.list", "trusty-desktop-i386.list"],
+            publisher.find_images(self.directory, "trusty", "desktop"))
 
     def test_find_source_images(self):
         for name in (
             "MD5SUMS",
-            "raring-src-1.iso", "raring-src-2.iso", "raring-src-3.iso",
+            "trusty-src-1.iso", "trusty-src-2.iso", "trusty-src-3.iso",
         ):
             touch(os.path.join(self.directory, name))
         publisher = Publisher(self.tree, "daily-live")
         self.assertEqual(
-            [1, 2, 3], publisher.find_source_images(self.directory, "raring"))
+            [1, 2, 3], publisher.find_source_images(self.directory, "trusty"))
 
     def test_find_any_with_extension(self):
         for name in (
             "MD5SUMS",
-            "raring-desktop-amd64.iso", "raring-desktop-amd64.iso.torrent",
-            "raring-desktop-i386.iso", "raring-desktop-i386.list",
+            "trusty-desktop-amd64.iso", "trusty-desktop-amd64.iso.torrent",
+            "trusty-desktop-i386.iso", "trusty-desktop-i386.list",
         ):
             touch(os.path.join(self.directory, name))
         publisher = Publisher(self.tree, "daily-live")
@@ -496,21 +476,21 @@
         # upgrading to XHTML so that we can use an XML parser.
         self.config["PROJECT"] = "ubuntu"
         self.config["CAPPROJECT"] = "Ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         for name in (
             "MD5SUMS",
-            "raring-desktop-amd64.iso", "raring-desktop-amd64.iso.zsync",
-            "raring-desktop-i386.iso", "raring-desktop-i386.list",
+            "trusty-desktop-amd64.iso", "trusty-desktop-amd64.iso.zsync",
+            "trusty-desktop-i386.iso", "trusty-desktop-i386.list",
         ):
             touch(os.path.join(self.directory, name))
         publisher = Publisher(self.tree, "daily-live")
-        publisher.make_web_indices(self.directory, "raring", status="daily")
+        publisher.make_web_indices(self.directory, "trusty", status="daily")
 
         self.assertCountEqual([
             "HEADER.html", "FOOTER.html", ".htaccess",
             "MD5SUMS",
-            "raring-desktop-amd64.iso", "raring-desktop-amd64.iso.zsync",
-            "raring-desktop-i386.iso", "raring-desktop-i386.list",
+            "trusty-desktop-amd64.iso", "trusty-desktop-amd64.iso.zsync",
+            "trusty-desktop-i386.iso", "trusty-desktop-i386.list",
         ], os.listdir(self.directory))
 
         header_path = os.path.join(self.directory, "HEADER.html")
@@ -533,13 +513,13 @@
             self.assertEqual(
                 "AddDescription \"Desktop image for 64-bit PC (AMD64) "
                 "computers (<a href=\\\"http://zsync.moria.org.uk/\\\">"
-                "zsync</a> metafile)\" raring-desktop-amd64.iso.zsync\n"
+                "zsync</a> metafile)\" trusty-desktop-amd64.iso.zsync\n"
                 "AddDescription \"Desktop image for 64-bit PC (AMD64) "
-                "computers (standard download)\" raring-desktop-amd64.iso\n"
-                "AddDescription \"Desktop image for 32-bit PC (i386) "
-                "computers (standard download)\" raring-desktop-i386.iso\n"
-                "AddDescription \"Desktop image for 32-bit PC (i386) "
-                "computers (file listing)\" raring-desktop-i386.list\n"
+                "computers (standard download)\" trusty-desktop-amd64.iso\n"
+                "AddDescription \"Desktop image for 32-bit PC (i386) "
+                "computers (standard download)\" trusty-desktop-i386.iso\n"
+                "AddDescription \"Desktop image for 32-bit PC (i386) "
+                "computers (file listing)\" trusty-desktop-i386.list\n"
                 "\n"
                 "HeaderName HEADER.html\n"
                 "ReadmeName FOOTER.html\n"
@@ -739,35 +719,24 @@
             ("edubuntu", None, "daily-preinstalled", "i386", 4700372992),
             ("edubuntu", None, "dvd", "i386", 4700372992),
             ("ubuntustudio", None, "dvd", "i386", 4700372992),
-            ("ubuntu-mid", None, "daily-live", "i386", 1073741824),
-            ("ubuntu-moblin-remix", None, "daily-live", "i386", 1073741824),
             ("kubuntu", "trusty", "daily-live", "i386", 1283457024),
             ("kubuntu", "xenial", "daily-live", "i386", 2000000000),
             ("kubuntu-active", "trusty", "daily-live", "i386", 1283457024),
             ("kubuntu-active", "xenial", "daily-live", "i386", 2000000000),
-            ("kubuntu-plasma5", "trusty", "daily-live", "i386", 1283457024),
-            ("kubuntu-plasma5", "xenial", "daily-live", "i386", 2000000000),
             ("ubuntu", None, "dvd", "i386", 4700372992),
             ("ubuntu", "precise", "daily-live", "i386", 736665600),
-            ("ubuntu", "quantal", "daily-live", "i386", 801000000),
-            ("ubuntu", "raring", "daily-live", "i386", 835000000),
-            ("ubuntu", "raring", "daily-live", "powerpc", 850000000),
-            ("ubuntu", "saucy", "daily-live", "i386", 950000000),
-            ("ubuntu", "saucy", "daily-live", "powerpc", 950000000),
             ("ubuntu", "trusty", "daily-live", "i386", 1200000000),
             ("ubuntu", "trusty", "daily-live", "powerpc", 1200000000),
             ("ubuntu", "xenial", "daily-live", "i386", 2000000000),
-            ("xubuntu", "quantal", "daily-live", "i386", 736665600),
-            ("xubuntu", "raring", "daily-live", "i386", 1073741824),
             ("xubuntu", "xenial", "daily-live", "i386", 2000000000),
-            ("ubuntu-gnome", "saucy", "daily-live", "i386", 1073741824),
+            ("ubuntu-gnome", "trusty", "daily-live", "i386", 1073741824),
             ("ubuntu-gnome", "xenial", "daily-live", "i386", 2000000000),
-            ("ubuntu-budgie", "zesty", "daily-live", "i386", 2000000000),
+            ("ubuntu-budgie", "bionic", "daily-live", "i386", 2000000000),
             ("ubuntu-mate", "trusty", "daily-live", "amd64", 1073741824),
             ("ubuntu-mate", "xenial", "daily-live", "amd64", 2000000000),
             ("ubuntu-server", "xenial", "daily", "amd64", 1073741824),
-            ("ubuntu-server", "zesty", "daily", "amd64", 736665600),
-            ("ubuntu-server", "zesty", "daily", "ppc64el", 1073741824),
+            ("ubuntu-server", "bionic", "daily", "amd64", 1073741824),
+            ("ubuntu-server", "bionic", "daily", "ppc64el", 1073741824),
         ):
             if dist is not None:
                 self.config["DIST"] = dist
@@ -843,27 +812,21 @@
 
     def test_jigdo_ports_powerpc(self):
         publisher = self.make_publisher("ubuntu", "daily")
-        for series in all_series[:5]:
-            publisher.config["DIST"] = series
-            self.assertFalse(publisher.jigdo_ports("powerpc"))
         for series in all_series[5:]:
             publisher.config["DIST"] = series
             self.assertTrue(publisher.jigdo_ports("powerpc"))
 
     def test_jigdo_ports_sparc(self):
         publisher = self.make_publisher("ubuntu", "daily")
-        for series in all_series[:3] + all_series[7:]:
+        for series in all_series[7:]:
             publisher.config["DIST"] = series
             self.assertTrue(publisher.jigdo_ports("sparc"))
-        for series in all_series[3:7]:
-            publisher.config["DIST"] = series
-            self.assertFalse(publisher.jigdo_ports("sparc"))
 
     def test_jigdo_ports(self):
         publisher = self.make_publisher("ubuntu", "daily")
         for arch in ("amd64", "i386"):
             self.assertFalse(publisher.jigdo_ports(arch))
-        for arch in ("armel", "armhf", "hppa", "ia64", "lpia", "ppc64el",
+        for arch in ("armel", "armhf", "hppa", "ia64", "ppc64el",
                      "s390x"):
             self.assertTrue(publisher.jigdo_ports(arch))
 
@@ -921,7 +884,7 @@
                 return_value="img.xz")
     @mock.patch("cdimage.tree.zsyncmake")
     def test_publish_core_binary(self, mock_zsyncmake, *args):
-        self.config["DIST"] = "artful"
+        self.config["DIST"] = "xenial"
         publisher = self.make_publisher("ubuntu-core", "daily-live")
         source_dir = publisher.image_output("amd64")
         touch(os.path.join(
@@ -1025,17 +988,17 @@
             os.readlink(os.path.join(publisher.publish_base, "current")))
 
     def test_published_images(self):
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         publisher = self.make_publisher("ubuntu", "daily-live")
         target_dir = os.path.join(publisher.publish_base, "20130321")
         for name in (
             "MD5SUMS",
-            "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest",
-            "raring-desktop-i386.iso", "raring-desktop-i386.manifest",
+            "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest",
+            "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest",
         ):
             touch(os.path.join(target_dir, name))
         self.assertEqual(
-            set(["raring-desktop-amd64.iso", "raring-desktop-i386.iso"]),
+            set(["trusty-desktop-amd64.iso", "trusty-desktop-i386.iso"]),
             publisher.published_images("20130321"))
 
     def test_published_core_images(self):
@@ -1057,12 +1020,12 @@
 
     @mock.patch("cdimage.tree.DailyTreePublisher.polish_directory")
     def test_mark_current_missing_to_single(self, mock_polish_directory):
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         publisher = self.make_publisher("ubuntu", "daily-live")
         target_dir = os.path.join(publisher.publish_base, "20130321")
         for name in (
-            "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest",
-            "raring-desktop-i386.iso", "raring-desktop-i386.manifest",
+            "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest",
+            "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest",
         ):
             touch(os.path.join(target_dir, name))
         publisher.mark_current("20130321", ["amd64", "i386"])
@@ -1073,13 +1036,13 @@
 
     @mock.patch("cdimage.tree.DailyTreePublisher.polish_directory")
     def test_mark_current_missing_to_mixed(self, mock_polish_directory):
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         publisher = self.make_publisher("ubuntu", "daily-live")
         target_dir = os.path.join(publisher.publish_base, "20130321")
         for name in (
             "MD5SUMS",
-            "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest",
-            "raring-desktop-i386.iso", "raring-desktop-i386.manifest",
+            "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest",
+            "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest",
         ):
             touch(os.path.join(target_dir, name))
         publisher.mark_current("20130321", ["amd64"])
@@ -1087,10 +1050,10 @@
         self.assertFalse(os.path.islink(publish_current))
         self.assertTrue(os.path.isdir(publish_current))
         self.assertCountEqual(
-            ["raring-desktop-amd64.iso", "raring-desktop-amd64.manifest"],
+            ["trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest"],
             os.listdir(publish_current))
         for name in (
-            "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest",
+            "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest",
         ):
             path = os.path.join(publish_current, name)
             self.assertTrue(os.path.islink(path))
@@ -1101,12 +1064,12 @@
 
     @mock.patch("cdimage.tree.DailyTreePublisher.polish_directory")
     def test_mark_current_single_to_single(self, mock_polish_directory):
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         publisher = self.make_publisher("ubuntu", "daily-live")
         for date in "20130320", "20130321":
             for name in (
-                "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest",
-                "raring-desktop-i386.iso", "raring-desktop-i386.manifest",
+                "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest",
+                "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest",
             ):
                 touch(os.path.join(publisher.publish_base, date, name))
         publish_current = os.path.join(publisher.publish_base, "current")
@@ -1118,13 +1081,13 @@
 
     @mock.patch("cdimage.tree.DailyTreePublisher.polish_directory")
     def test_mark_current_single_to_mixed(self, mock_polish_directory):
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         publisher = self.make_publisher("ubuntu", "daily-live")
         for date in "20130320", "20130321":
             for name in (
                 "MD5SUMS",
-                "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest",
-                "raring-desktop-i386.iso", "raring-desktop-i386.manifest",
+                "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest",
+                "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest",
             ):
                 touch(os.path.join(publisher.publish_base, date, name))
         publish_current = os.path.join(publisher.publish_base, "current")
@@ -1133,13 +1096,13 @@
         self.assertFalse(os.path.islink(publish_current))
         self.assertTrue(os.path.isdir(publish_current))
         self.assertCountEqual([
-            "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest",
-            "raring-desktop-i386.iso", "raring-desktop-i386.manifest",
+            "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest",
+            "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest",
         ], os.listdir(publish_current))
         for date, arch in (("20130320", "i386"), ("20130321", "amd64")):
             for name in (
-                "raring-desktop-%s.iso" % arch,
-                "raring-desktop-%s.manifest" % arch,
+                "trusty-desktop-%s.iso" % arch,
+                "trusty-desktop-%s.manifest" % arch,
             ):
                 path = os.path.join(publish_current, name)
                 self.assertTrue(os.path.islink(path))
@@ -1153,21 +1116,21 @@
 
     @mock.patch("cdimage.tree.DailyTreePublisher.polish_directory")
     def test_mark_current_mixed_to_single(self, mock_polish_directory):
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         publisher = self.make_publisher("ubuntu", "daily-live")
         for date in "20130320", "20130321":
             for name in (
                 "MD5SUMS",
-                "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest",
-                "raring-desktop-i386.iso", "raring-desktop-i386.manifest",
+                "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest",
+                "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest",
             ):
                 touch(os.path.join(publisher.publish_base, date, name))
         publish_current = os.path.join(publisher.publish_base, "current")
         osextras.ensuredir(publish_current)
         for date, arch in (("20130320", "i386"), ("20130321", "amd64")):
             for name in (
-                "raring-desktop-%s.iso" % arch,
-                "raring-desktop-%s.manifest" % arch,
+                "trusty-desktop-%s.iso" % arch,
+                "trusty-desktop-%s.manifest" % arch,
             ):
                 os.symlink(
                     os.path.join(os.pardir, date, name),
@@ -1179,25 +1142,25 @@
 
     @mock.patch("cdimage.tree.DailyTreePublisher.polish_directory")
     def test_mark_current_mixed_to_mixed(self, mock_polish_directory):
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         publisher = self.make_publisher("ubuntu", "daily-live")
         for date in "20130320", "20130321":
             for name in (
                 "MD5SUMS",
-                "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest",
-                "raring-desktop-amd64+mac.iso",
-                "raring-desktop-amd64+mac.manifest",
-                "raring-desktop-i386.iso", "raring-desktop-i386.manifest",
-                "raring-desktop-powerpc.iso",
-                "raring-desktop-powerpc.manifest",
+                "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest",
+                "trusty-desktop-amd64+mac.iso",
+                "trusty-desktop-amd64+mac.manifest",
+                "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest",
+                "trusty-desktop-powerpc.iso",
+                "trusty-desktop-powerpc.manifest",
             ):
                 touch(os.path.join(publisher.publish_base, date, name))
         publish_current = os.path.join(publisher.publish_base, "current")
         osextras.ensuredir(publish_current)
         for date, arch in (("20130320", "i386"), ("20130321", "amd64")):
             for name in (
-                "raring-desktop-%s.iso" % arch,
-                "raring-desktop-%s.manifest" % arch,
+                "trusty-desktop-%s.iso" % arch,
+                "trusty-desktop-%s.manifest" % arch,
             ):
                 os.symlink(
                     os.path.join(os.pardir, date, name),
@@ -1206,12 +1169,12 @@
         self.assertFalse(os.path.islink(publish_current))
         self.assertTrue(os.path.isdir(publish_current))
         self.assertCountEqual([
-            "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest",
-            "raring-desktop-i386.iso", "raring-desktop-i386.manifest",
+            "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest",
+            "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest",
         ], os.listdir(publish_current))
         for name in (
-            "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest",
-            "raring-desktop-i386.iso", "raring-desktop-i386.manifest",
+            "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest",
+            "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest",
         ):
             path = os.path.join(publish_current, name)
             self.assertTrue(os.path.islink(path))
@@ -1227,19 +1190,19 @@
         self.assertFalse(os.path.islink(publish_current))
         self.assertTrue(os.path.isdir(publish_current))
         self.assertCountEqual([
-            "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest",
-            "raring-desktop-amd64+mac.iso",
-            "raring-desktop-amd64+mac.manifest",
-            "raring-desktop-i386.iso", "raring-desktop-i386.manifest",
-            "raring-desktop-powerpc.iso", "raring-desktop-powerpc.manifest",
+            "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest",
+            "trusty-desktop-amd64+mac.iso",
+            "trusty-desktop-amd64+mac.manifest",
+            "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest",
+            "trusty-desktop-powerpc.iso", "trusty-desktop-powerpc.manifest",
         ], os.listdir(publish_current))
         for date, arch in (
             ("20130320", "amd64+mac"), ("20130320", "powerpc"),
             ("20130321", "amd64"), ("20130321", "i386"),
         ):
             for name in (
-                "raring-desktop-%s.iso" % arch,
-                "raring-desktop-%s.manifest" % arch,
+                "trusty-desktop-%s.iso" % arch,
+                "trusty-desktop-%s.manifest" % arch,
             ):
                 path = os.path.join(publish_current, name)
                 self.assertTrue(os.path.islink(path))
@@ -1257,8 +1220,8 @@
         publisher = self.make_publisher("ubuntu", "daily-live")
         old_target_dir = os.path.join(publisher.publish_base, "20130321")
         for name in (
-            "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest",
-            "raring-desktop-i386.iso", "raring-desktop-i386.manifest",
+            "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest",
+            "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest",
         ):
             touch(os.path.join(old_target_dir, name))
         target_dir = os.path.join(publisher.publish_base, "20130921")
@@ -1292,8 +1255,6 @@
             ("ubuntu", "daily-live", "desktop", "Ubuntu Desktop"),
             ("kubuntu", "daily-live", "desktop", "Kubuntu Desktop"),
             ("kubuntu-active", "daily-live", "desktop", "Kubuntu Active"),
-            ("kubuntu-plasma5", "daily-live", "desktop",
-                "Kubuntu Plasma 5 Desktop"),
             ("edubuntu", "dvd", "dvd", "Edubuntu DVD"),
             ("xubuntu", "daily-live", "desktop", "Xubuntu Desktop"),
             ("ubuntu-server", "daily", "server", "Ubuntu Server"),
@@ -1308,8 +1269,6 @@
             ("ubuntu-budgie", "daily-live", "desktop",
                 "Ubuntu Budgie Desktop"),
             ("ubuntu-mate", "daily-live", "desktop", "Ubuntu MATE Desktop"),
-            ("ubuntu-desktop-next", "daily-preinstalled",
-                "preinstalled-desktop-next", "Ubuntu Desktop (Unity 8)"),
         ):
             # Use "daily" here to match bin/post-qa; qa_product shouldn't
             # use the publisher's image_type at all.
@@ -1335,15 +1294,6 @@
                 "ubuntu-touch", "daily-preinstalled", "preinstalled-touch",
                 "armhf"))
 
-    def test_qa_product_ubuntu_touch_custom(self):
-        publisher = self.make_publisher(
-            "ubuntu-touch-custom", "daily-preinstalled")
-        self.assertEqual(
-            ("Ubuntu Touch Custom armhf", "iso"),
-            publisher.qa_product(
-                "ubuntu-touch-custom", "daily-preinstalled",
-                "preinstalled-touch", "armhf"))
-
     def test_qa_product_ubuntu_preinstalled(self):
         publisher = self.make_publisher("ubuntu", "daily")
         self.assertEqual(
@@ -1365,8 +1315,6 @@
             ("ubuntu", "daily-live", "desktop", "Ubuntu Desktop"),
             ("kubuntu", "daily-live", "desktop", "Kubuntu Desktop"),
             ("kubuntu-active", "daily-live", "desktop", "Kubuntu Active"),
-            ("kubuntu-plasma5", "daily-live", "desktop",
-                "Kubuntu Plasma 5 Desktop"),
             ("edubuntu", "dvd", "dvd", "Edubuntu DVD"),
             ("xubuntu", "daily-live", "desktop", "Xubuntu Desktop"),
             ("ubuntu-server", "daily", "server", "Ubuntu Server"),
@@ -1381,8 +1329,6 @@
             ("ubuntu-budgie", "daily-live", "desktop",
                 "Ubuntu Budgie Desktop"),
             ("ubuntu-mate", "daily-live", "desktop", "Ubuntu MATE Desktop"),
-            ("ubuntu-desktop-next/system-image", "daily-preinstalled",
-                "preinstalled-desktop-next", "Ubuntu Desktop (Unity 8)"),
         ):
             # Use "daily" here to match bin/post-qa; qa_product shouldn't
             # use the publisher's image_type at all.
@@ -1405,14 +1351,14 @@
         os.makedirs(os.path.join(publisher.publish_base, "20130221"))
         publisher.post_qa(
             "20130221", [
-                "ubuntu/daily-live/raring-desktop-i386",
-                "ubuntu/daily-live/raring-desktop-amd64",
+                "ubuntu/daily-live/trusty-desktop-i386",
+                "ubuntu/daily-live/trusty-desktop-amd64",
             ])
         expected = [
             ["Ubuntu Desktop i386", "20130221", ""],
             ["Ubuntu Desktop amd64", "20130221", ""],
         ]
-        self.assertEqual("iso-raring", isotracker_module.tracker.target)
+        self.assertEqual("iso-trusty", isotracker_module.tracker.target)
         self.assertEqual(expected, isotracker_module.tracker.posted)
 
         os.makedirs(os.path.join(
@@ -1434,14 +1380,14 @@
         publisher = self.make_publisher("ubuntu", "daily-live")
         touch(os.path.join(
             self.temp_dir, "www", "full", "daily-live", "20130315",
-            "raring-desktop-i386.OVERSIZED"))
+            "trusty-desktop-i386.OVERSIZED"))
         publisher.post_qa(
-            "20130315", ["ubuntu/daily-live/raring-desktop-i386"])
+            "20130315", ["ubuntu/daily-live/trusty-desktop-i386"])
         expected_note = (
             "<strong>WARNING: This image is OVERSIZED. This should never "
             "happen during milestone testing.</strong>")
         expected = [["Ubuntu Desktop i386", "20130315", expected_note]]
-        self.assertEqual("iso-raring", isotracker_module.tracker.target)
+        self.assertEqual("iso-trusty", isotracker_module.tracker.target)
         self.assertEqual(expected, isotracker_module.tracker.posted)
 
         publisher = self.make_publisher("kubuntu", "daily-live")
@@ -1463,7 +1409,7 @@
         self.assertRaisesRegex(
             Exception, r"Cannot post images from nonexistent directory: .*",
             publisher.post_qa, "bad-date",
-            ["ubuntu/daily-live/raring-desktop-i386"])
+            ["ubuntu/daily-live/trusty-desktop-i386"])
 
     @mock.patch("subprocess.call", return_value=0)
     @mock.patch("cdimage.tree.DailyTreePublisher.make_web_indices")
@@ -1652,8 +1598,8 @@
         publish_current = os.path.join(publisher.publish_base, "current")
         os.makedirs(publish_current)
         os.symlink(
-            os.path.join(os.pardir, "20130319", "raring-desktop-i386.iso"),
-            os.path.join(publish_current, "raring-desktop-i386.iso"))
+            os.path.join(os.pardir, "20130319", "trusty-desktop-i386.iso"),
+            os.path.join(publish_current, "trusty-desktop-i386.iso"))
         with mkfile(os.path.join(
                 self.temp_dir, "etc", "purge-days")) as purge_days:
             print("daily 1", file=purge_days)
@@ -1805,16 +1751,10 @@
         return publisher
 
     def test_image_output(self):
-        self.config["DIST"] = "natty"
-        self.assertEqual(
-            os.path.join(
-                self.config.root, "scratch", "ubuntu-chinese-edition",
-                "natty"),
-            self.make_publisher("ubuntu", "daily-live").image_output("i386"))
-        self.config["DIST"] = "oneiric"
-        self.assertEqual(
-            os.path.join(
-                self.config.root, "scratch", "ubuntu-zh_CN", "oneiric",
+        self.config["DIST"] = "precise"
+        self.assertEqual(
+            os.path.join(
+                self.config.root, "scratch", "ubuntu-zh_CN", "precise",
                 "daily-live", "live"),
             self.make_publisher("ubuntu", "daily-live").image_output("i386"))
 
@@ -1906,15 +1846,15 @@
     def test_post_qa_oversized(self):
         publisher = self.make_publisher("ubuntu", "daily-live")
         touch(os.path.join(
-            self.temp_dir, "www", "china-images", "raring", "daily-live",
-            "20130315", "raring-desktop-i386.OVERSIZED"))
+            self.temp_dir, "www", "china-images", "trusty", "daily-live",
+            "20130315", "trusty-desktop-i386.OVERSIZED"))
         publisher.post_qa(
-            "20130315", ["ubuntu-zh_CN/raring/daily-live/raring-desktop-i386"])
+            "20130315", ["ubuntu-zh_CN/trusty/daily-live/trusty-desktop-i386"])
         expected_note = (
             "<strong>WARNING: This image is OVERSIZED. This should never "
             "happen during milestone testing.</strong>")
         expected = [["Ubuntu Chinese Desktop i386", "20130315", expected_note]]
-        self.assertEqual("localized-iso-china-raring",
+        self.assertEqual("localized-iso-china-trusty",
                          isotracker_module.tracker.target)
         self.assertEqual(expected, isotracker_module.tracker.posted)
 
@@ -2123,18 +2063,18 @@
 
     def test_daily_base(self):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "quantal"
+        self.config["DIST"] = "trusty"
         self.assertEqual(
             os.path.join(
-                self.temp_dir, "www", "full", "quantal", "daily", "20130327",
+                self.temp_dir, "www", "full", "trusty", "daily", "20130327",
                 "i386"),
             self.get_publisher().daily_base(
-                "quantal/daily", "20130327", "wubi", "i386"))
-        self.config["DIST"] = "raring"
+                "trusty/daily", "20130327", "wubi", "i386"))
+        self.config["DIST"] = "trusty"
         self.assertEqual(
             os.path.join(
                 self.temp_dir, "www", "full", "daily-live", "20130327",
-                "raring-desktop-i386"),
+                "trusty-desktop-i386"),
             self.get_publisher().daily_base(
                 "daily-live", "20130327", "desktop", "i386"))
 
@@ -2191,7 +2131,7 @@
     def test_symlink(self):
         pool_path = os.path.join(self.temp_dir, ".pool", "foo.iso")
         touch(pool_path)
-        dist_path = os.path.join(self.temp_dir, "raring", "foo.iso")
+        dist_path = os.path.join(self.temp_dir, "trusty", "foo.iso")
         os.makedirs(os.path.dirname(dist_path))
         self.get_publisher().symlink(pool_path, dist_path)
         self.assertEqual(
@@ -2201,7 +2141,7 @@
     def test_hardlink(self):
         pool_path = os.path.join(self.temp_dir, ".pool", "foo.iso")
         touch(pool_path)
-        dist_path = os.path.join(self.temp_dir, "raring", "foo.iso")
+        dist_path = os.path.join(self.temp_dir, "trusty", "foo.iso")
         os.makedirs(os.path.dirname(dist_path))
         self.get_publisher().hardlink(pool_path, dist_path)
         self.assertEqual(os.stat(pool_path), os.stat(dist_path))
@@ -2295,15 +2235,15 @@
 
     def test_target_dir(self):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.assertEqual(
             os.path.join(
-                self.temp_dir, "www", "full", "releases", "raring", "release"),
+                self.temp_dir, "www", "full", "releases", "trusty", "release"),
             self.get_publisher().target_dir("daily", "20130327", "alternate"))
         self.config["PROJECT"] = "kubuntu"
         self.assertEqual(
             os.path.join(
-                self.temp_dir, "www", "full", "kubuntu", "releases", "raring",
+                self.temp_dir, "www", "full", "kubuntu", "releases", "trusty",
                 "release", "source"),
             self.get_publisher().target_dir("daily", "20130327", "src"))
 
@@ -2321,17 +2261,17 @@
 
     def test_torrent_dir(self):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.assertEqual(
             os.path.join(
                 self.temp_dir, "www", "torrent", "releases",
-                "raring", "release", "desktop"),
+                "trusty", "release", "desktop"),
             self.get_publisher().torrent_dir("daily-live", "desktop"))
         self.config["PROJECT"] = "kubuntu"
         self.assertEqual(
             os.path.join(
                 self.temp_dir, "www", "torrent", "kubuntu", "releases",
-                "raring", "beta-2", "desktop"),
+                "trusty", "beta-2", "desktop"),
             self.get_publisher(status="beta-2").torrent_dir(
                 "daily-live", "desktop"))
 
@@ -2367,9 +2307,9 @@
 
     def test_publish_release_prefixes(self):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.assertEqual(
-            ("raring", "raring-beta2"),
+            ("trusty", "trusty-beta2"),
             self.get_publisher(
                 official="no", status="beta-2").publish_release_prefixes())
         self.config["PROJECT"] = "kubuntu"
@@ -2445,16 +2385,16 @@
     def test_publish_release_arch_ubuntu_desktop_no(self, mock_call, *args):
         self.config["PROJECT"] = "ubuntu"
         self.config["CAPPROJECT"] = "Ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         daily_dir = os.path.join(
             self.temp_dir, "www", "full", "daily-live", "20130327")
-        touch(os.path.join(daily_dir, "raring-desktop-i386.iso"))
-        touch(os.path.join(daily_dir, "raring-desktop-i386.manifest"))
-        touch(os.path.join(daily_dir, "raring-desktop-i386.iso.zsync"))
+        touch(os.path.join(daily_dir, "trusty-desktop-i386.iso"))
+        touch(os.path.join(daily_dir, "trusty-desktop-i386.manifest"))
+        touch(os.path.join(daily_dir, "trusty-desktop-i386.iso.zsync"))
         target_dir = os.path.join(
-            self.temp_dir, "www", "full", "releases", "raring", "rc")
+            self.temp_dir, "www", "full", "releases", "trusty", "rc")
         torrent_dir = os.path.join(
-            self.temp_dir, "www", "torrent", "releases", "raring", "rc",
+            self.temp_dir, "www", "torrent", "releases", "trusty", "rc",
             "desktop")
         osextras.ensuredir(target_dir)
         osextras.ensuredir(torrent_dir)
@@ -2464,13 +2404,13 @@
             "daily-live", "20130327", "desktop", "i386")
         self.assertLogEqual([
             "Copying desktop-i386 image ...",
-            "Creating torrent for %s/raring-desktop-i386.iso ..." % target_dir,
+            "Creating torrent for %s/trusty-desktop-i386.iso ..." % target_dir,
         ])
         self.assertCountEqual([
-            "raring-desktop-i386.iso", "raring-desktop-i386.iso.torrent",
-            "raring-desktop-i386.iso.zsync", "raring-desktop-i386.manifest",
+            "trusty-desktop-i386.iso", "trusty-desktop-i386.iso.torrent",
+            "trusty-desktop-i386.iso.zsync", "trusty-desktop-i386.manifest",
         ], os.listdir(target_dir))
-        target_base = os.path.join(target_dir, "raring-desktop-i386")
+        target_base = os.path.join(target_dir, "trusty-desktop-i386")
         self.assertFalse(os.path.islink("%s.iso" % target_base))
         self.assertFalse(os.path.islink("%s.manifest" % target_base))
         mock_call.assert_called_once_with([
@@ -2479,9 +2419,9 @@
             "%s.iso" % target_base,
         ], stdout=mock.ANY)
         self.assertCountEqual([
-            "raring-desktop-i386.iso", "raring-desktop-i386.iso.torrent",
+            "trusty-desktop-i386.iso", "trusty-desktop-i386.iso.torrent",
         ], os.listdir(torrent_dir))
-        torrent_base = os.path.join(torrent_dir, "raring-desktop-i386")
+        torrent_base = os.path.join(torrent_dir, "trusty-desktop-i386")
         self.assertEqual(
             os.stat("%s.iso" % target_base), os.stat("%s.iso" % torrent_base))
         self.assertEqual(
@@ -2581,14 +2521,14 @@
 
     def test_target_dir(self):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.assertEqual(
-            os.path.join(self.temp_dir, "www", "simple", "raring"),
+            os.path.join(self.temp_dir, "www", "simple", "trusty"),
             self.get_publisher().target_dir("daily", "20130327", "alternate"))
         self.config["PROJECT"] = "kubuntu"
         self.assertEqual(
             os.path.join(
-                self.temp_dir, "www", "simple", "kubuntu", "raring", "source"),
+                self.temp_dir, "www", "simple", "kubuntu", "trusty", "source"),
             self.get_publisher().target_dir("daily", "20130327", "src"))
 
     def test_version_link(self):
@@ -2604,29 +2544,29 @@
 
     def test_pool_dir(self):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.assertEqual(
             os.path.join(self.temp_dir, "www", "simple", ".pool"),
             self.get_publisher().pool_dir("daily"))
         self.config["PROJECT"] = "kubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.assertEqual(
             os.path.join(self.temp_dir, "www", "simple", "kubuntu", ".pool"),
             self.get_publisher().pool_dir("daily"))
 
     def test_torrent_dir(self):
         self.config["PROJECT"] = "ubuntu"
-        self.config["DIST"] = "raring"
+        self.config["DIST"] = "trusty"
         self.assertEqual(
             os.path.join(
                 self.temp_dir, "www", "torrent", "simple",
-                "raring", "desktop"),
+                "trusty", "desktop"),
             self.get_publisher().torrent_dir("daily-live", "desktop"))
         self.config["PROJECT"] = "kubuntu"
         self.assertEqual(
             os.path.join(
                 self.temp_dir, "www", "torrent", "kubuntu", "simple",
-                "raring", "desktop"),
+                "trusty", "desktop"),
             self.get_publisher().torrent_dir("daily-live", "desktop"))
 
     def test_want_torrent(self):
@@ -2776,9 +2716,9 @@
             "ubuntu-13.04-rc-desktop-i386.manifest",
         ], os.listdir(pool_dir))
         self.assertFalse(os.path.exists(os.path.join(
-            self.temp_dir, "www", "simple", "raring")))
+            self.temp_dir, "www", "simple", "trusty")))
         self.assertFalse(os.path.exists(os.path.join(
-            self.temp_dir, "www", "torrent", "simple", "raring", "desktop")))
+            self.temp_dir, "www", "torrent", "simple", "trusty", "desktop")))
         pool_base = os.path.join(pool_dir, "ubuntu-13.04-rc-desktop-i386")
         mock_call.assert_called_once_with([
             "zsyncmake", "-o", "%s.iso.zsync" % pool_base,
 
=== modified file 'lib/cdimage/tree.py'
--- lib/cdimage/tree.py	2019-03-06 20:19:33 +0000
+++ lib/cdimage/tree.py	2019-03-07 16:20:18 +0000
@@ -63,21 +63,16 @@
 projects = [
     "edubuntu",
     "gobuntu",
-    "jeos",
     "kubuntu",
     "kubuntu-active",
     "kubuntu-netbook",
-    "kubuntu-plasma5",
     "lubuntu",
     "lubuntu-next",
     "mythbuntu",
     "ubuntu",
-    "ubuntu-desktop-next",
     "ubuntu-gnome",
     "ubuntu-budgie",
     "ubuntu-mate",
-    "ubuntu-headless",
-    "ubuntu-netbook",
     "ubuntu-server",
     "ubuntukylin",
     "ubuntustudio",
@@ -376,65 +371,36 @@
     @property
     def publish_type(self):
         if self.image_type.endswith("-preinstalled"):
-            if self.project == "ubuntu-netbook":
-                return "preinstalled-netbook"
-            elif self.project == "ubuntu-headless":
-                return "preinstalled-headless"
-            elif self.project == "ubuntu-server":
+            if self.project == "ubuntu-server":
                 return "preinstalled-server"
-            elif self.project in ("ubuntu-touch", "ubuntu-touch-custom"):
+            elif self.project == "ubuntu-touch":
                 return "preinstalled-touch"
             elif self.project == "ubuntu-core":
                 return "preinstalled-core"
-            elif self.project == "ubuntu-desktop-next":
-                return "preinstalled-desktop-next"
             else:
                 return "preinstalled-desktop"
         elif self.image_type.endswith("-live"):
             if self.project == "edubuntu":
-                if self.config["DIST"] <= "edgy":
-                    return "live"
-                else:
-                    return "desktop"
-            elif self.project == "ubuntu-mid":
-                return "mid"
-            elif self.project == "ubuntu-moblin-remix":
-                return "moblin-remix"
-            elif self.project in ("ubuntu-netbook", "kubuntu-netbook"):
+                return "desktop"
+            elif self.project == "kubuntu-netbook":
                 return "netbook"
             elif self.project == "ubuntu-server":
                 return "live-server"
             elif self.project == "ubuntu-core":
                 return "live-core"
             else:
-                if self.config["DIST"] <= "breezy":
-                    return "live"
-                else:
-                    return "desktop"
+                return "desktop"
         elif self.image_type.endswith("_dvd") or self.image_type == "dvd":
             return "dvd"
         else:
             if self.project == "edubuntu":
-                if self.config["DIST"] <= "edgy":
-                    return "install"
-                elif self.config["DIST"] <= "gutsy":
-                    return "server"
-                else:
-                    return "addon"
+                return "addon"
             elif self.project == "ubuntu-server":
-                if self.config["DIST"] <= "breezy":
-                    return "install"
-                else:
-                    return "server"
-            elif self.project == "jeos":
-                return "jeos"
+                return "server"
             elif self.project == "ubuntu-base":
                 return "base"
             else:
-                if self.config["DIST"] <= "breezy":
-                    return "install"
-                else:
-                    return "alternate"
+                return "alternate"
 
     # Keep this in sync with publish_type above.
     @staticmethod
@@ -442,13 +408,13 @@
         if publish_type.startswith("preinstalled-"):
             return "daily-preinstalled"
         elif publish_type in (
-                "desktop", "live", "mid", "moblin-remix", "netbook",
+                "desktop", "live", "netbook",
                 "live-core", "live-server"):
             return "daily-live"
         elif publish_type == "dvd":
             return "dvd"
         elif publish_type in (
-                "addon", "alternate", "base", "install", "jeos", "server"):
+                "addon", "alternate", "base", "install", "server"):
             return "daily"
         else:
             return None
@@ -474,8 +440,6 @@
     def cssincludes(self):
         if self.project == "kubuntu":
             return ["//releases.ubuntu.com/include/kubuntu.css"]
-        if self.project == "kubuntu-plasma5":
-            return ["//releases.ubuntu.com/include/kubuntu-plasma5.css"]
         if self.project in ("lubuntu", "lubuntu-next"):
             return ["//cdimage.ubuntu.com/include/lubuntu/style.css"]
         else:
@@ -485,11 +449,10 @@
     def cdtypestr(self, publish_type, image_format):
         if image_format in ("tar.gz", "tar.xz", "custom.tar.gz"):
             cd = "filesystem archive"
-        elif self.config["DIST"] < "quantal":
+        elif self.config["DIST"] < "trusty":
             if image_format in ("img", "img.gz"):
                 cd = "image"
             elif self.project == "ubuntustudio":
-                # Ubuntu Studio is expected to be oversized in Gutsy; sigh.
                 cd = "DVD"
             else:
                 cd = "CD"
@@ -523,18 +486,12 @@
             return "source %s" % cd
         elif publish_type == "netbook":
             return "netbook live %s" % cd
-        elif publish_type == "mid":
-            return "MID USB image"
-        elif publish_type == "moblin-remix":
-            return "Moblin live CD"
         elif publish_type == "active":
             return "preview active image"
         elif publish_type in ("server-uec", "uec"):
             return "UEC image"
         elif publish_type == "preinstalled-desktop":
             return "preinstalled desktop %s" % cd
-        elif publish_type == "preinstalled-headless":
-            return "preinstalled headless %s" % cd
         elif publish_type == "preinstalled-server":
             return "preinstalled server %s" % cd
         elif publish_type == "preinstalled-netbook":
@@ -545,8 +502,6 @@
             return "preinstalled touch image"
         elif publish_type == "preinstalled-core":
             return "preinstalled core image"
-        elif publish_type == "preinstalled-desktop-next":
-            return "preinstalled desktop next image"
         elif publish_type == "wubi":
             return "Wubi %s" % cd
         else:
@@ -556,35 +511,20 @@
         capproject = self.config.capproject
         series = self.config["DIST"]
 
-        if self.project == "mid":
-            # MID has lower memory requirements than others
-            desktop_ram = 128
         if self.project == "xubuntu":
-            if series <= "intrepid":
-                desktop_ram = 128
-            else:
-                desktop_ram = 192
+            desktop_ram = 192
         else:
-            if series <= "feisty":
-                desktop_ram = 256
-            elif series <= "gutsy":
-                desktop_ram = 320
-            elif series <= "hardy":
-                desktop_ram = 384
-            elif series <= "maverick":
-                desktop_ram = 256
-            elif series <= "artful":
+            if series <= "xenial":
                 desktop_ram = 384
             else:
                 desktop_ram = 1024
 
         if image_format in ("tar.gz", "tar.xz", "custom.tar.gz"):
             cd = "filesystem archive"
-        elif self.config["DIST"] < "quantal":
+        elif self.config["DIST"] <= "precise":
             if image_format in ("img", "img.gz"):
                 cd = "image"
             elif self.project == "ubuntustudio":
-                # Ubuntu Studio is expected to be oversized in Gutsy; sigh.
                 cd = "dvd"
             else:
                 cd = "cd"
@@ -612,13 +552,6 @@
                     cd)
                 self.prefmsg_emitted = True
             sentences.append(desktop_req)
-            if self.project == "ubuntu-desktop-next":
-                sentences.append(
-                    "This is an experimental image. Please %s for caveats and "
-                    "workarounds." %
-                    Link("https://wiki.ubuntu.com/Unity8DesktopIso",
-                         "read this page on the Ubuntu wiki",
-                         show_class=True))
             if self.project == "edubuntu":
                 sentences.append(
                     "You can install additional educational programs using "
@@ -651,24 +584,6 @@
                 "installer, please file a bug on the %s package." % bug_link,
             ])
             return
-        elif publish_type == "mid":
-            sentences.append(
-                "The MID USB image allows you to try %s without changing your "
-                "computer at all, and at your option to install it "
-                "permanently later." % capproject)
-            sentences.append(
-                "This USB image is optimized for handheld devices with 4-7\" "
-                "touchscreens and limited processing power.")
-            sentences.append(desktop_req)
-        elif publish_type == "moblin-remix":
-            sentences.append(
-                "The live %s allows you to try Ubuntu Moblin Remix without "
-                "changing your computer at all, and at your option to install "
-                "it permanently later." % cd)
-            sentences.append(
-                "This live %s is optimized for netbooks with screens up to "
-                "10\"." % cd)
-            sentences.append(desktop_req)
         elif publish_type == "server" or publish_type == "live-server":
             if self.project == "edubuntu":
                 sentences.append(
@@ -832,7 +747,6 @@
         "hppa": "HP PA-RISC",
         "i386": "32-bit PC (i386)",
         "ia64": "IA-64",
-        "lpia": "Low-Power Intel Architecture",
         "powerpc": "Mac (PowerPC) and IBM-PPC (POWER5)",
         "powerpc+ps3": "PlayStation 3",
         "ppc64el": "PowerPC64 Little-Endian",
@@ -911,10 +825,6 @@
                 "Intel processors.")
         elif arch == "ia64":
             sentences.append("For Intel Itanium and Itanium 2 computers.")
-        elif arch == "lpia":
-            sentences.append(
-                "For devices using the Low-Power Intel Architecture, "
-                "including the A1xx and Atom processors.")
         elif arch == "powerpc":
             sentences.append(
                 "For Apple Macintosh G3, G4, and G5 computers, including "
@@ -922,7 +832,7 @@
                 "machines.")
         elif arch == "powerpc+ps3":
             sentences.append("For Sony PlayStation 3 systems.")
-            if publish_type == "desktop" and self.config["DIST"] >= "gutsy":
+            if publish_type == "desktop":
                 capproject = self.config.capproject
                 sentences.append(
                     "(This defaults to installing %s permanently, since there "
@@ -952,8 +862,7 @@
             return
 
         usb_projects = (
-            "ubuntu-mid", "ubuntu-moblin-remix",
-            "kubuntu", "kubuntu-active", "kubuntu-plasma5",
+            "kubuntu", "kubuntu-active",
             "ubuntu-mate",
             )
         series = self.config["DIST"]
@@ -979,8 +888,8 @@
                 "However, you may still test it using a DVD, a larger USB "
                 "drive, or a virtual machine.")
         elif (self.project in usb_projects or
-                (self.project == "xubuntu" and series >= "raring") or
-                (self.project == "ubuntu-gnome" and series >= "saucy")):
+                (self.project == "xubuntu" and series >= "trusty") or
+                (self.project == "ubuntu-gnome" and series >= "trusty")):
             sentences.append(
                 "Warning: This image is oversized (which is a bug) and will "
                 "not fit onto a 1GB USB stick.")
@@ -1156,13 +1065,13 @@
             "serveraddon", "addon",
             "dvd",
             "src",
-            "netbook", "mid", "moblin-remix", "mobile", "active",
+            "netbook", "mobile", "active",
             "uec", "server-uec",
             "preinstalled-desktop", "preinstalled-netbook",
             "preinstalled-mobile", "preinstalled-active",
-            "preinstalled-headless", "preinstalled-server",
+            "preinstalled-server",
             "preinstalled-touch", "preinstalled-core", "wubi",
-            "preinstalled-desktop-next", "live-core",
+            "live-core",
         )
 
         all_arches = (
@@ -1178,7 +1087,6 @@
             "ppc64el",
             "hppa",
             "ia64",
-            "lpia",
             "s390x",
             "sparc",
         )
@@ -1254,12 +1162,6 @@
                     "<link "
                     "href='http://fonts.googleapis.com/css?family=Ubuntu' "
                     "rel='stylesheet' type='text/css'>", file=header)
-            if self.project == "kubuntu-plasma5":
-                print(
-                    "<link "
-                    "href='http://fonts.googleapis.com/css?family=Oxygen' "
-                    "rel='stylesheet' type='text/css'>", file=header)
-            if self.project in ("kubuntu", "kubuntu-plasma5"):
                 print(
                     "<link rel=\"icon\" type=\"image/png\" "
                     "href=\"http://www.kubuntu.org/themes/kubuntu10.04/"
@@ -1315,11 +1217,8 @@
             if ("full" in reldir.split(os.pardir) and
                     "-alpha-" not in base_prefix and
                     base_prefix != self.config.series):
-                if self.project in (
-                        "ubuntu", "ubuntu-server", "ubuntu-netbook"):
+                if self.project in ("ubuntu", "ubuntu-server"):
                     url = "http://releases.ubuntu.com/"
-                elif self.project == "kubuntu" and series <= "oneiric":
-                    url = "http://releases.ubuntu.com/kubuntu/"
                 else:
                     url = None
                 if url:
@@ -1427,17 +1326,9 @@
 
                         for path, arch, base in paths:
                             if arch is None:
-                                if publish_type == "mid":
-                                    imgarch = "lpia"
-                                else:
-                                    raise WebIndicesException(
-                                        "Unknown image type %s!" %
-                                        publish_type)
-                                archstr = self.arch_strings[imgarch]
-                                imagestr = "%s %s" % (archstr, cdtypestr)
-                                htaccessimagestr = "%s for %s computers" % (
-                                    self.titlecase(cdtypestr), archstr)
-                                archdesc = self.archdesc(imgarch, publish_type)
+                                raise WebIndicesException(
+                                    "Unknown image type %s!" %
+                                    publish_type)
                             elif publish_type == "src":
                                 imagestr = "%s %s" % (
                                     self.titlecase(cdtypestr), arch)
@@ -1638,7 +1529,7 @@
             if got_iso or got_img:
                 print(file=header)
 
-            if self.config.project in ("ubuntu-touch", "ubuntu-touch-custom"):
+            if self.config.project == "ubuntu-touch":
                 for tag in self.ubuntu_touch_legal_notice():
                     print(tag, file=header)
                 print(file=header)
@@ -1845,15 +1736,7 @@
             # All Edubuntu images are DVD sized (including arm).
             # Ubuntu Studio is always DVD-sized for now.
             return 4700372992
-        elif self.project in (
-                "ubuntu-mid", "ubuntu-moblin-remix",
-                ):
-            # Mobile images are designed for USB drives; arbitrarily pick
-            # 1GB as a limit.
-            return 1024 * 1024 * 1024
-        elif self.project in (
-                "kubuntu", "kubuntu-active", "kubuntu-plasma5",
-                ):
+        elif self.project in ("kubuntu", "kubuntu-active"):
             if self.config["DIST"] >= "xenial":
                 # Per https://lists.ubuntu.com/archives/
                 # ... ubuntu-release/2016-May/003749.html
@@ -1862,23 +1745,14 @@
             return (1024 * 1024 * 1024) + (1024 * 1024 * 200)
         elif (self.project in ("ubuntu", "ubuntukylin") and
               self.publish_type != "dvd" and
-              self.config["DIST"] >= "quantal"):
-            # Ubuntu quantal onward has a succession of arbitrary limits.
-            if self.config["DIST"] == "quantal":
-                return 801000000
-            elif self.config["DIST"] == "raring":
-                if arch == "powerpc":
-                    return 850000000
-                else:
-                    return 835000000
-            elif self.config["DIST"] == "saucy":
-                return 950000000
-            elif self.config["DIST"] in ("trusty", "utopic", "vivid", "wily"):
+              self.config["DIST"] >= "trusty"):
+            if self.config["DIST"] == "trusty":
                 return 1.2 * 1000 * 1000 * 1000
             else:
                 # next relevant size limit is a 2GB (not 2GiB) USB stick
                 return 2 * 1000 * 1000 * 1000
-        elif self.project == "ubuntu-gnome" and self.config["DIST"] >= "saucy":
+        elif (self.project == "ubuntu-gnome" and
+              self.config["DIST"] >= "trusty"):
             # Per https://lists.ubuntu.com/archives/
             # ... ubuntu-release/2016-May/003740.html
             if self.config["DIST"] >= "xenial":
@@ -1895,7 +1769,7 @@
         elif self.project == "xubuntu" and self.config["DIST"] >= "xenial":
             # https://irclogs.ubuntu.com/2019/02/17/%23ubuntu-release.html#t03:04
             return 2 * 1000 * 1000 * 1000
-        elif self.project == "xubuntu" and self.config["DIST"] >= "raring":
+        elif self.project == "xubuntu" and self.config["DIST"] >= "trusty":
             # http://irclogs.ubuntu.com/2013/02/11/%23xubuntu-devel.html#t21:48
             return 1024 * 1024 * 1024
         elif self.project == "ubuntu-mate":
@@ -1907,7 +1781,7 @@
             # https://bugs.launchpad.net/bugs/1796368
             return 2 * 1000 * 1000 * 1000
         elif (self.project in ("lubuntu", "lubuntu-next") and
-              self.config["DIST"] >= "artful"):
+              self.config["DIST"] >= "bionic"):
             # https://irclogs.ubuntu.com/2017/07/27/%23ubuntu-release.html#t23:05
             return int(1.5 * 1000 * 1000 * 1000)
         elif self.project == "lubuntu" and self.config["DIST"] >= "trusty":
@@ -1915,11 +1789,7 @@
             # https://irclogs.ubuntu.com/2016/10/01/%23ubuntu-release.html#t19:06
             return 1024 * 1024 * 1024
         elif self.project == "ubuntu-server":
-            if self.config["DIST"] == "xenial":
-                return 1024 * 1024 * 1024
-            elif self.config["DIST"] >= "zesty" and arch == "ppc64el":
-                return 1024 * 1024 * 1024
-            elif self.config["DIST"] >= "bionic":
+            if self.config["DIST"] >= "xenial":
                 return 1024 * 1024 * 1024
             else:
                 return 736665600
@@ -2002,20 +1872,17 @@
             return "iso"
 
     def jigdo_ports(self, arch):
-        series = self.config["DIST"]
         cpuarch = arch.split("+")[0]
         if cpuarch == "powerpc":
             # https://lists.ubuntu.com/archives/ubuntu-announce/2007-February/
             #   000098.html
-            if series > "edgy":
-                return True
+            return True
         elif cpuarch == "sparc":
             # https://lists.ubuntu.com/archives/ubuntu-devel-announce/
             #   2008-March/000400.html
-            if series < "dapper" or series > "gutsy":
-                return True
+            return True
         elif cpuarch in (
-                "arm64", "armel", "armhf", "hppa", "ia64", "lpia", "ppc64el",
+                "arm64", "armel", "armhf", "hppa", "ia64", "ppc64el",
                 "s390x"):
             return True
         return False
@@ -2377,17 +2244,14 @@
             for arch in arches:
                 if image_base.endswith("-%s" % arch):
                     matches = True
-                elif (self.config.project in ("ubuntu-touch",
-                                              "ubuntu-touch-custom") and
+                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 in ("ubuntu-touch",
-                                              "ubuntu-touch-custom") and
+                elif (self.config.project == "ubuntu-touch" and
                       arch == "i386" and "-i386+" in image_base):
                     matches = True
-                elif (self.config.project in ("ubuntu-touch",
-                                              "ubuntu-touch-custom") and
+                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:
@@ -2834,18 +2698,13 @@
     """An object that can publish daily builds of the Chinese edition."""
 
     def image_output(self, arch):
-        if self.config["DIST"] < "oneiric":
-            return os.path.join(
-                self.config.root, "scratch", "ubuntu-chinese-edition",
-                self.config.full_series)
-        else:
-            project = "ubuntu"
-            if self.config["UBUNTU_DEFAULTS_LOCALE"]:
-                project = "-".join([
-                    project, self.config["UBUNTU_DEFAULTS_LOCALE"]])
-            return os.path.join(
-                self.config.root, "scratch", project, self.config.full_series,
-                self.image_type, "live")
+        project = "ubuntu"
+        if self.config["UBUNTU_DEFAULTS_LOCALE"]:
+            project = "-".join([
+                project, self.config["UBUNTU_DEFAULTS_LOCALE"]])
+        return os.path.join(
+            self.config.root, "scratch", project, self.config.full_series,
+            self.image_type, "live")
 
     @property
     def source_extension(self):
@@ -2871,8 +2730,7 @@
 
     def tree_suffix(self, source):
         # Publish ports/daily to ports/releases/..., etc.
-        ubuntu_projects = (
-            "ubuntu-server", "ubuntu-netbook", "ubuntu-mid", "ubuntu-headless")
+        ubuntu_projects = ("ubuntu-server", )
         if "/" in source:
             project, tail = source.split("/", 1)
             if project in ubuntu_projects:
@@ -3009,10 +2867,7 @@
     def daily_base(self, source, date, publish_type, arch):
         series = self.config["DIST"]
         daily_dir = self.daily_dir(source, date, publish_type)
-        if publish_type in ("netbook", "mid") and series <= "intrepid":
-            return os.path.join(
-                daily_dir, "%s-%s" % (self.project, publish_type))
-        elif publish_type == "wubi":
+        if publish_type == "wubi":
             return os.path.join(daily_dir, arch)
         else:
             return os.path.join(
@@ -3176,7 +3031,7 @@
 
     def want_manifest(self, publish_type, path):
         if publish_type in (
-            "live", "desktop", "netbook", "mid", "moblin-remix",
+            "live", "desktop", "netbook",
             "uec", "server-uec", "core", "wubi", "server", "live-server",
         ):
             return True
@@ -3195,7 +3050,7 @@
     def want_metalink(self, publish_type):
         # TODO: maybe others?  metalink is only supported for Wubi
         if publish_type in (
-            "netbook", "mid", "moblin-remix", "uec", "server-uec",
+            "netbook", "uec", "server-uec",
         ):
             return False
         elif publish_type.startswith("preinstalled-"):
@@ -3393,14 +3248,12 @@
 
         # Override the architecture list for these types unconditionally.
         # TODO: should reset default-arches for the source project instead
-        if (publish_type in ("netbook", "moblin-remix") and
+        if (publish_type == "netbook" and
                 not [arch for arch in arches if arch.startswith("armel")]):
             arches = ["i386"]
-        elif publish_type == "mid":
-            arches = ["lpia"]
 
         # Sanity-check.
-        if publish_type not in ("netbook", "mid", "src"):
+        if publish_type not in ("netbook", "src"):
             for arch in arches:
                 paths = []
                 for ext in ("iso", "img", "img.gz", "img.xz", "img.tar.gz",