Merge ~mwhudson/ubuntu-cdimage:no-ubuntustudio-dvd into ubuntu-cdimage:main

[Michael Hudson-Doyle]

drop the 'dvd' image type

Ubuntu Studio for noble and earlier still uses the ubuntustudio-dvd
project in livecd-rootfs but is still a 'daily-live' image which means
it will be published to slightly different paths on ubuntu-cdimage.

There are probably some bits of tree.py that can be trimmed now but one
thing at a time...

This needs to be coordinated with https://code.launchpad.net/~mwhudson/livecd-rootfs/+git/livecd-rootfs/+merge/465832

[Steve Langasek (vorlon)]

review: Approve

diff --git a/bin/cron.dvd b/bin/cron.dvd
deleted file mode 100755
index 5566973..0000000
--- a/bin/cron.dvd
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /usr/bin/python3
-
-# Copyright (C) 2013 Canonical Ltd.
-# Author: Colin Watson <[e-mail]>
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Build a set of DVD images."""
-
-from optparse import OptionParser
-import os
-import sys
-
-sys.path.insert(0, os.path.join(sys.path[0], os.pardir, "lib"))
-
-
-def main():
-    from cdimage.build import build_image_set
-    from cdimage.config import Config
-
-    parser = OptionParser("%prog")
-    parser.add_option(
-        "--live", default=False, action="store_true",
-        help="build live filesystems first")
-    options, _ = parser.parse_args()
-    config = Config(IMAGE_TYPE="dvd")
-    project = config.project
-    if project not in ("ubuntu", "ubuntustudio"):
-        print("unsupported configuration!")
-        sys.exit(1)
-    config["CDIMAGE_LIVE"] = "1"
-    config["CDIMAGE_DVD"] = "1"
-    if not build_image_set(config, options):
-        sys.exit(1)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/etc/cdimage-to-livecd-rootfs-map b/etc/cdimage-to-livecd-rootfs-map
index 0ab778c..a9e60e9 100644
--- a/etc/cdimage-to-livecd-rootfs-map
+++ b/etc/cdimage-to-livecd-rootfs-map
@@ -1,10 +1,11 @@
-# PROJECT			IMAGE_TYPE			DIST		ARCH		SUBARCH		LIVEFS_PROJECT		LIVEFS_CPUARCH	LIVEFS_SUBARCH
+# PROJECT		IMAGE_TYPE		DIST		ARCH		SUBARCH		LIVEFS_PROJECT		LIVEFS_CPUARCH	LIVEFS_SUBARCH
 # Put more specific matches first.
 # Like etc/default-arches, "PROJECT" is in fact PROJECT[-SUBPROJECT]. "-" means 'empty'.
 
-ubuntu-server		daily-preinstalled	*			riscv64		unleashed	ubuntu-cpc			*				sifive_fu540
-ubuntu-server		daily-preinstalled	jammy			riscv64		unmatched	ubuntu-cpc			*				sifive_hifive_unmatched_fu740
-ubuntu-server		daily-preinstalled	*			*			-			ubuntu-cpc			*				generic
-ubuntu-server		daily-preinstalled	*			*			*			ubuntu-cpc			*				*
-ubuntu-appliance	*					*			*			*			ubuntu-core			*				*
-livecd-base			*					*			*			*			base				*				*
+ubuntu-server		daily-preinstalled	*		riscv64		unleashed	ubuntu-cpc		*		sifive_fu540
+ubuntu-server		daily-preinstalled	jammy		riscv64		unmatched	ubuntu-cpc		*		sifive_hifive_unmatched_fu740
+ubuntu-server		daily-preinstalled	*		*		-		ubuntu-cpc		*		generic
+ubuntu-server		daily-preinstalled	*		*		*		ubuntu-cpc		*		*
+ubuntu-appliance	*			*		*		*		ubuntu-core		*		*
+livecd-base		*			*		*		*		base			*		*
+ubuntustudio		*			-noble		*		*		ubuntustudio-dvd	*		*
diff --git a/etc/crontab b/etc/crontab
index 70ccb88..058ade5 100644
--- a/etc/crontab
+++ b/etc/crontab
@@ -72,7 +72,7 @@ PATH=/srv/cdimage.ubuntu.com/bin:/usr/sbin:/usr/bin:/sbin:/bin
 40 1 * * *	for-project xubuntu cron.daily-live --live; SUBPROJECT=minimal for-project xubuntu cron.daily-minimal --live
 41 1 * * *	for-project edubuntu cron.daily-live --live; for-project edubuntu cron.daily-preinstalled --live
 10 3 * * *	for-project ubuntu-server cron.daily-preinstalled --live; SUBPROJECT=live for-project ubuntu-server cron.daily-live --live
-27 18 * * *	for-project ubuntustudio cron.dvd --live
+27 18 * * *	for-project ubuntustudio cron.daily-live --live
 39 16 * * *	for-project lubuntu cron.daily-live --live
 24 22 * * *	for-project ubuntukylin cron.daily-live --live
 10 15 * * *	for-project ubuntu-budgie cron.daily-live --live
diff --git a/etc/livefs-launchpad b/etc/livefs-launchpad
index 2bb71b6..bfcc98b 100644
--- a/etc/livefs-launchpad
+++ b/etc/livefs-launchpad
@@ -15,13 +15,13 @@ ubuntu-server		daily-preinstalled	bionic-		*		ubuntu-cdimage/cpc
 # Temporary experimental image-set, canary preinstalled images for custom arches
 #ubuntu-server		daily-canary	jammy		*		ubuntu-cdimage/cpc
 ubuntu-server-live	daily-live		bionic-		*		ubuntu-cdimage/ubuntu-server-live
-ubuntustudio		dvd			*		*		ubuntu-cdimage/ubuntustudio
+ubuntustudio		daily-live		*		*		ubuntu-cdimage/ubuntustudio
 lubuntu-next		daily-live		*		*		ubuntu-cdimage/lubuntu-next
 lubuntu			daily-live		*		*		ubuntu-cdimage/lubuntu
 livecd-base		livecd-base		*		*		ubuntu-cdimage/livecd-base
 ubuntu-base		daily			*		*		ubuntu-cdimage/ubuntu-base
 ubuntu-core		daily-live		*		*		ubuntu-cdimage/ubuntu-core
-ubuntu-core-desktop		daily-live		*		*		ubuntu-cdimage/ubuntu-core-desktop
+ubuntu-core-desktop	daily-live		*		*		ubuntu-cdimage/ubuntu-core-desktop
 ubuntu-appliance	daily-live		*		*		ubuntu-cdimage/ubuntu-core
 ubuntu-core-system-image daily-preinstalled	*		*		ubuntu-cdimage/ubuntu-core-system-image
 ubuntukylin		daily-live		*		*		ubuntu-cdimage/ubuntukylin
diff --git a/etc/qa-products b/etc/qa-products
index c63af06..726c148 100644
--- a/etc/qa-products
+++ b/etc/qa-products
@@ -90,6 +90,7 @@ Ubuntu Server Subiquity riscv64					ubuntu-server/live	daily-live			live-server	
 
 # Ubuntu Studio
 Ubuntu Studio DVD amd64						ubuntustudio	dvd					dvd						amd64			iso
+Ubuntu Studio amd64						ubuntustudio	daily-live					dvd						amd64			iso
 Ubuntu Studio DVD i386						ubuntustudio	dvd					dvd						i386			iso
 
 # Ubuntu Kylin
diff --git a/lib/cdimage/germinate.py b/lib/cdimage/germinate.py
index 004e2a3..2cc50e2 100644
--- a/lib/cdimage/germinate.py
+++ b/lib/cdimage/germinate.py
@@ -207,7 +207,8 @@ class GerminateOutput:
         project = self.config.project
 
         if project == "ubuntustudio":
-            yield "dvd"
+            if self.config.series <= "noble":
+                yield "dvd"
             yield "ship-live"
         elif project == "ubuntu-server":
             yield "server-ship-live"
diff --git a/lib/cdimage/livefs.py b/lib/cdimage/livefs.py
index f361745..2300b6f 100644
--- a/lib/cdimage/livefs.py
+++ b/lib/cdimage/livefs.py
@@ -129,13 +129,7 @@ def live_build_options(config, arch):
 
 
 def live_project(config, arch):
-    liveproject = config.livefs_project_for_arch(arch)
-
-    if config["CDIMAGE_DVD"]:
-        if config.project in ("ubuntu", "kubuntu", "ubuntustudio"):
-            liveproject += "-dvd"
-
-    return liveproject
+    return config.livefs_project_for_arch(arch)
 
 
 def live_build_command(config, arch):
diff --git a/lib/cdimage/tests/test_livefs.py b/lib/cdimage/tests/test_livefs.py
index 10744a8..ccedce3 100644
--- a/lib/cdimage/tests/test_livefs.py
+++ b/lib/cdimage/tests/test_livefs.py
@@ -188,22 +188,6 @@ class TestLiveProject(TestCase):
     def test_project_livecd_base(self):
         self.assertProjectEqual("base", "livecd-base", "dapper")
 
-    def test_ubuntu_dvd(self):
-        for series in all_series[7:]:
-            self.assertProjectEqual(
-                "ubuntu-dvd", "ubuntu", series.full_name, cdimage_dvd="1")
-
-    def test_kubuntu_dvd(self):
-        for series in all_series[7:]:
-            self.assertProjectEqual(
-                "kubuntu-dvd", "kubuntu", series.full_name, cdimage_dvd="1")
-
-    def test_ubuntustudio_dvd(self):
-        for series in all_series[15:]:
-            self.assertProjectEqual(
-                "ubuntustudio-dvd", "ubuntustudio", series.full_name,
-                cdimage_dvd="1")
-
     def test_ubuntu_appliance(self):
         # We currently only support ubuntu-appliances for bionic (UC18)
         self.assertProjectEqual(