xubuntu-dev team mailing list archive

[Sean Davis <mp+435316@xxxxxxxxxxxxxxxxxx>]

Sean Davis has proposed merging ~xubuntu-dev/ubuntu-cdimage:xubuntu-core into ubuntu-cdimage:main.

Commit message:
Add Xubuntu Core

Requested reviews:
  Ubuntu CD Image Team (ubuntu-cdimage)

For more details, see:
https://code.launchpad.net/~xubuntu-dev/ubuntu-cdimage/+git/ubuntu-cdimage/+merge/435316

Some history:
- https://xubuntu.org/news/introducing-xubuntu-core/
- https://github.com/Xubuntu/xubuntu-development/issues/1

Announced in 2015 and supported by our community members since, Xubuntu Core is a trimmed down version of Xubuntu that fits on smaller installation media.

The Xubuntu Team would very much like to have official images published for Xubuntu Core starting with the 23.04 cycle.

Related Merge Requests:
- debian-cd: https://code.launchpad.net/~xubuntu-dev/debian-cd/+git/debian-cd/+merge/435314
- livecd-rootfs: https://code.launchpad.net/~xubuntu-dev/livecd-rootfs/+git/livecd-rootfs/+merge/435315
-- 
Your team Xubuntu Developers is subscribed to branch ~xubuntu-dev/ubuntu-cdimage:xubuntu-core.

diff --git a/bin/daily-checks b/bin/daily-checks
index 6bf04cf..7d31e3d 100755
--- a/bin/daily-checks
+++ b/bin/daily-checks
@@ -116,7 +116,7 @@ def check_image(config, project, series, image):
             warn(project, image, "%s oversized by %d bytes (%d)" %
                                  (iso, size - sizelimit, size))
 
-    if project == 'xubuntu':
+    if project in ('xubuntu', 'xubuntu-core'):
         for manifest in filter(
                 lambda x: x.endswith('.list') or x.endswith('.manifest'),
                 files):
@@ -228,6 +228,7 @@ def main():
         'ubuntu-server',
         'kubuntu',
         'xubuntu',
+        'xubuntu-core',
         'ubuntustudio',
         'kubuntu-netbook',
         'mythbuntu',
diff --git a/etc/config b/etc/config
index 524e7d8..3dd8abb 100644
--- a/etc/config
+++ b/etc/config
@@ -51,7 +51,7 @@ case $DIST in
         ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu ubuntustudio lubuntu ubuntukylin ubuntu-mate ubuntu-budgie}"
         ;;
     *)
-        ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu ubuntustudio lubuntu ubuntukylin ubuntu-mate ubuntu-budgie ubuntu-unity}"
+        ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu xubuntu-core ubuntustudio lubuntu ubuntukylin ubuntu-mate ubuntu-budgie ubuntu-unity}"
         ;;
 esac
 
diff --git a/etc/crontab b/etc/crontab
index 58cff5a..f4aa9ac 100644
--- a/etc/crontab
+++ b/etc/crontab
@@ -55,6 +55,7 @@ PATH=/srv/cdimage.ubuntu.com/bin:/usr/sbin:/usr/bin:/sbin:/bin
 41 8 * * *	SUBPROJECT=legacy for-project ubuntu cron.daily-legacy --live
 24 5 * * *	for-project kubuntu cron.daily-live --live
 40 1 * * *	for-project xubuntu cron.daily-live --live
+40 2 * * *	for-project xubuntu-core cron.daily-live --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
 39 16 * * *	for-project lubuntu cron.daily-live --live
diff --git a/etc/default-arches b/etc/default-arches
index 5572c9f..ffb3471 100644
--- a/etc/default-arches
+++ b/etc/default-arches
@@ -67,6 +67,7 @@ ubuntustudio		*			focal-			amd64
 
 xubuntu			*			trusty-bionic		amd64 i386
 xubuntu			*			focal-			amd64
+xubuntu-core			*			*			amd64
 
 *			dvd			trusty-bionic		amd64 i386
 *			dvd			*			amd64
diff --git a/etc/livefs-launchpad b/etc/livefs-launchpad
index d4fced2..156d140 100644
--- a/etc/livefs-launchpad
+++ b/etc/livefs-launchpad
@@ -8,6 +8,7 @@ ubuntu-canary			daily-live		*		disco-		ubuntu-cdimage/ubuntu-canary
 ubuntu-desktop-preinstalled daily-preinstalled	focal-		*		ubuntu-cdimage/ubuntu-preinstalled
 kubuntu			daily-live		*		*		ubuntu-cdimage/kubuntu
 xubuntu			daily-live		*		*		ubuntu-cdimage/xubuntu
+xubuntu-core			daily-live		*		*		ubuntu-cdimage/xubuntu-core
 ubuntu-server		daily			trusty-		*		ubuntu-cdimage/ubuntu-server
 ubuntu-server		daily-preinstalled	xenial-		*		ubuntu-cdimage/cpc
 ubuntu-server-live	daily-live		bionic-		*		ubuntu-cdimage/ubuntu-server-live
diff --git a/etc/qa-products b/etc/qa-products
index ea32841..1005e1e 100644
--- a/etc/qa-products
+++ b/etc/qa-products
@@ -117,6 +117,7 @@ Ubuntu Kylin Desktop arm64					ubuntukylin		daily-live			desktop					arm64			iso
 Ubuntu Unity Desktop amd64					ubuntu-unity	daily-live			desktop					amd64			iso
 
 # Xubuntu
+Xubuntu Core amd64						xubuntu			daily-live			desktop					amd64			iso
 Xubuntu Desktop amd64						xubuntu			daily-live			desktop					amd64			iso
 Xubuntu Desktop i386						xubuntu			daily-live			desktop					i386			iso
 
diff --git a/lib/cdimage/build.py b/lib/cdimage/build.py
index 306c347..16b5d42 100644
--- a/lib/cdimage/build.py
+++ b/lib/cdimage/build.py
@@ -78,7 +78,7 @@ def configure_for_project(config):
     series = config["DIST"]
     if project == "gobuntu":
         config["CDIMAGE_ONLYFREE"] = "1"
-    elif project == "xubuntu":
+    elif project in ("xubuntu", "xubuntu-core"):
         config["CDIMAGE_UNSUPPORTED"] = "1"
     elif project == "kubuntu":
         if series >= "trusty":
diff --git a/lib/cdimage/germinate.py b/lib/cdimage/germinate.py
index af88a5f..452e1cb 100644
--- a/lib/cdimage/germinate.py
+++ b/lib/cdimage/germinate.py
@@ -78,7 +78,7 @@ class Germination:
                 sources.insert(0, gitpattern % "ubuntustudio-dev")
             elif project == "mythbuntu":
                 sources.insert(0, bzrpattern % "mythbuntu-dev")
-            elif project == "xubuntu":
+            elif project in ("xubuntu", "xubuntu-core"):
                 sources.insert(0, gitpattern % "xubuntu-dev")
             elif project in ("lubuntu", "lubuntu-next"):
                 sources.insert(0, gitpattern % "lubuntu-dev")
diff --git a/lib/cdimage/project.py b/lib/cdimage/project.py
index 8995d68..89a95d8 100644
--- a/lib/cdimage/project.py
+++ b/lib/cdimage/project.py
@@ -32,6 +32,7 @@ project_map = {
     "ubuntu-zh_CN": "Ubuntu Chinese Edition",
     "kubuntu": "Kubuntu",
     "xubuntu": "Xubuntu",
+    "xubuntu-core": "Xubuntu-Core",
     "gobuntu": "Gobuntu",
     "ubuntu-server": "Ubuntu-Server",
     "ubuntustudio": "Ubuntu-Studio",
diff --git a/lib/cdimage/tests/test_build.py b/lib/cdimage/tests/test_build.py
index d7e5dbc..4ab5ef4 100644
--- a/lib/cdimage/tests/test_build.py
+++ b/lib/cdimage/tests/test_build.py
@@ -592,6 +592,7 @@ class TestBuildImageSet(TestCase):
             ("ubuntu", "trusty", False, False),
             ("gobuntu", "hardy", True, False),
             ("xubuntu", "precise", False, True),
+            ("xubuntu-core", "lunar", False, True),
             ("kubuntu", "precise", False, False),
             ("kubuntu", "trusty", False, True),
             ("ubuntustudio", "trusty", False, True),
diff --git a/lib/cdimage/tests/test_tree.py b/lib/cdimage/tests/test_tree.py
index c293665..4c50085 100644
--- a/lib/cdimage/tests/test_tree.py
+++ b/lib/cdimage/tests/test_tree.py
@@ -312,6 +312,9 @@ class TestPublisherWebIndices(TestCase):
             ("xubuntu",
              [assets + "/vanilla-framework-version-1.8.0.min.css",
               "//cdimage.ubuntu.com/include/xubuntu/style.css"]),
+            ("xubuntu-core",
+             [assets + "/vanilla-framework-version-1.8.0.min.css",
+              "//cdimage.ubuntu.com/include/xubuntu/style.css"]),
         ):
             self.config["PROJECT"] = project
             publisher = Publisher(self.tree, "daily")
@@ -1420,6 +1423,7 @@ class TestDailyTreePublisher(TestCase):
             ("ubuntu", "daily-live", "desktop", "Ubuntu Desktop"),
             ("kubuntu", "daily-live", "desktop", "Kubuntu Desktop"),
             ("xubuntu", "daily-live", "desktop", "Xubuntu Desktop"),
+            ("xubuntu-core", "daily-live", "desktop", "Xubuntu Core"),
             ("ubuntu-server", "daily", "server", "Ubuntu Server"),
             ("ubuntustudio", "dvd", "dvd", "Ubuntu Studio DVD"),
             ("mythbuntu", "daily-live", "desktop", "Mythbuntu Desktop"),
@@ -1478,6 +1482,7 @@ class TestDailyTreePublisher(TestCase):
             ("ubuntu", "daily-live", "desktop", "Ubuntu Desktop"),
             ("kubuntu", "daily-live", "desktop", "Kubuntu Desktop"),
             ("xubuntu", "daily-live", "desktop", "Xubuntu Desktop"),
+            ("xubuntu-core", "daily-live", "desktop", "Xubuntu Core"),
             ("ubuntu-server", "daily", "server", "Ubuntu Server"),
             ("ubuntustudio", "dvd", "dvd", "Ubuntu Studio DVD"),
             ("mythbuntu", "daily-live", "desktop", "Mythbuntu Desktop"),
diff --git a/lib/cdimage/tree.py b/lib/cdimage/tree.py
index 3be7f9a..32df283 100644
--- a/lib/cdimage/tree.py
+++ b/lib/cdimage/tree.py
@@ -80,6 +80,7 @@ projects = [
     "ubuntukylin",
     "ubuntustudio",
     "xubuntu",
+    "xubuntu-core",
 ]
 
 
@@ -495,7 +496,7 @@ class Publisher:
             return [vanilla, "//cdimage.ubuntu.com/include/kubuntu/style.css"]
         if self.project in ("lubuntu", "lubuntu-next"):
             return [vanilla, "//cdimage.ubuntu.com/include/lubuntu/style.css"]
-        if self.project == "xubuntu":
+        if self.project in ("xubuntu", "xubuntu-core"):
             return [vanilla, "//cdimage.ubuntu.com/include/xubuntu/style.css"]
         else:
             return [vanilla]
@@ -1012,7 +1013,8 @@ class Publisher:
                                "kubuntu",
                                "ubuntu-mate",
                                "ubuntu-budgie",
-                               "xubuntu") and series >= "xenial"):
+                               "xubuntu",
+                               "xubuntu-core") and series >= "xenial"):
             sentences.append(
                 "Warning: This image is oversized (which is a bug) and will "
                 "not fit onto a 2GB USB stick.")
@@ -1020,7 +1022,7 @@ class Publisher:
                 "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 >= "trusty") or
+                (self.project in ("xubuntu", "xubuntu-core") and series >= "trusty") or
                 (self.project == "ubuntu-gnome" and series >= "trusty")):
             sentences.append(
                 "Warning: This image is oversized (which is a bug) and will "
@@ -1326,7 +1328,7 @@ class Publisher:
                     'href="//cdimage.ubuntu.com/include/lubuntu/'
                     'favicon.png">', file=header)
                 header_href = 'https://lubuntu.me/'
-            elif self.project == "xubuntu":
+            elif self.project in ("xubuntu", "xubuntu-core"):
                 print(
                     '<link rel="icon" type="image/png" '
                     'href="//cdimage.ubuntu.com/include/xubuntu/'
@@ -1963,13 +1965,13 @@ class DailyTreePublisher(Publisher):
               self.config["DIST"] >= "focal"):
             # Per IRC discussions on #ubuntu-flavors on the 2020-10-05
             return 4 * 1024 * 1024 * 1024
-        elif self.project == "xubuntu" and self.config["DIST"] >= "kinetic":
+        elif self.project in ("xubuntu", "xubuntu-core") and self.config["DIST"] >= "kinetic":
             # Per IRC discussions on #ubuntu-release 2022-09-16
             return 3.0 * 1000 * 1000 * 1000
-        elif self.project == "xubuntu" and self.config["DIST"] >= "jammy":
+        elif self.project in ("xubuntu", "xubuntu-core") and self.config["DIST"] >= "jammy":
             # Per IRC discussions on #ubuntu-release 2022-04-17
             return 2.8 * 1000 * 1000 * 1000
-        elif self.project in ("ubuntu-budgie", "mythbuntu", "xubuntu",
+        elif self.project in ("ubuntu-budgie", "mythbuntu", "xubuntu", "xubuntu-core",
                               "ubuntu-gnome", "ubuntu-mate"):
             # https://lists.ubuntu.com/archives/ubuntu-release/2016-May/003744.html
             # https://irclogs.ubuntu.com/2019/02/17/%23ubuntu-release.html#t03:04