Merge lp:~xubuntu-dev/ubuntu-cdimage/xubuntu-base into lp:ubuntu-cdimage

Proposed by Sean Davis on 2018-06-02
Status: Needs review
Proposed branch: lp:~xubuntu-dev/ubuntu-cdimage/xubuntu-base
Merge into: lp:ubuntu-cdimage
Diff against target: 263 lines (+36/-7)
12 files modified
bin/daily-checks (+2/-1)
etc/config (+1/-1)
etc/crontab (+1/-0)
etc/default-arches (+2/-0)
etc/qa-products (+2/-0)
lib/cdimage/build.py (+1/-0)
lib/cdimage/germinate.py (+1/-1)
lib/cdimage/project.py (+1/-0)
lib/cdimage/tests/test_build.py (+1/-0)
lib/cdimage/tests/test_germinate.py (+1/-0)
lib/cdimage/tests/test_tree.py (+5/-1)
lib/cdimage/tree.py (+18/-3)
To merge this branch: bzr merge lp:~xubuntu-dev/ubuntu-cdimage/xubuntu-base
Reviewer Review Type Date Requested Status
Adam Conrad 2018-07-02 Pending
Ubuntu CD Image Team 2018-06-02 Pending
Review via email: mp+347320@code.launchpad.net

Commit message

Add xubuntu-base to ubuntu-cdimage

Description of the change

This series of patches adds Xubuntu Base to the official Ubuntu CD Image download links. Xubuntu Base is supported by the Xubuntu Team and is the ISO image for the xubuntu-core task which has been around for a few releases now.

There has been some conflict with the previous naming of Xubuntu Base/Core because of it's similarity to Ubuntu Core. Regardless, you can learn more about it here: https://xubuntu.org/news/introducing-xubuntu-core/

Related branches:
- https://code.launchpad.net/~xubuntu-dev/debian-cd/xubuntu-base
- https://code.launchpad.net/~xubuntu-dev/livecd-rootfs/xubuntu-base
- https://code.launchpad.net/~xubuntu-dev/ubuntu-cdimage/xubuntu-base

To post a comment you must log in.

Unmerged revisions

1563. By Sean Davis on 2018-06-02

Merge lp:ubuntu-cdimage revno 1736, add optional project param to _guess_image_type to disambiguate

1562. By Sean Davis on 2018-03-28

Merge lp:ubuntu-cdimage rev 1715

1561. By Sean Davis on 2016-01-26

Replace Xubuntu Core with Base

1560. By Sean Davis on 2016-01-26

Merge in lp:~unit193/ubuntu-cdimage/xubuntu-core

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/daily-checks'
--- bin/daily-checks 2018-05-02 22:06:50 +0000
+++ bin/daily-checks 2018-06-02 01:10:16 +0000
@@ -128,7 +128,7 @@
128 warn(project, image, "%s oversized by %d bytes (%d)" %128 warn(project, image, "%s oversized by %d bytes (%d)" %
129 (iso, size - sizelimit, size))129 (iso, size - sizelimit, size))
130130
131 if project == 'xubuntu':131 if project in ('xubuntu', 'xubuntu-base'):
132 for manifest in filter(132 for manifest in filter(
133 lambda x: x.endswith('.list') or x.endswith('.manifest'),133 lambda x: x.endswith('.list') or x.endswith('.manifest'),
134 files):134 files):
@@ -242,6 +242,7 @@
242 'kubuntu',242 'kubuntu',
243 'edubuntu',243 'edubuntu',
244 'xubuntu',244 'xubuntu',
245 'xubuntu-base',
245 'ubuntustudio',246 'ubuntustudio',
246 'ubuntu-netbook',247 'ubuntu-netbook',
247 'kubuntu-netbook',248 'kubuntu-netbook',
248249
=== modified file 'etc/config'
--- etc/config 2018-05-11 18:15:52 +0000
+++ etc/config 2018-06-02 01:10:16 +0000
@@ -53,7 +53,7 @@
53 ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu ubuntustudio mythbuntu lubuntu ubuntu-gnome ubuntukylin ubuntu-mate}"53 ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu ubuntustudio mythbuntu lubuntu ubuntu-gnome ubuntukylin ubuntu-mate}"
54 ;;54 ;;
55 *)55 *)
56 ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu ubuntustudio lubuntu ubuntukylin ubuntu-mate ubuntu-budgie}"56 ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu xubuntu-base ubuntustudio lubuntu ubuntukylin ubuntu-mate ubuntu-budgie}"
57 ;;57 ;;
58esac58esac
5959
6060
=== modified file 'etc/crontab'
--- etc/crontab 2018-05-04 04:02:06 +0000
+++ etc/crontab 2018-06-02 01:10:16 +0000
@@ -33,6 +33,7 @@
3330 8 * * * for-project ubuntu-core cron.daily-live --live3330 8 * * * for-project ubuntu-core cron.daily-live --live
3414 5 * * * for-project kubuntu cron.daily-live --live3414 5 * * * for-project kubuntu cron.daily-live --live
3550 1 * * * for-project xubuntu cron.daily-live --live3550 1 * * * for-project xubuntu cron.daily-live --live
3650 2 * * * for-project xubuntu-base cron.daily-live --live
3629 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 --live3729 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
3717 18 * * * for-project ubuntustudio cron.dvd --live3817 18 * * * for-project ubuntustudio cron.dvd --live
3829 16 * * * for-project lubuntu cron.daily-live --live3929 16 * * * for-project lubuntu cron.daily-live --live
3940
=== modified file 'etc/default-arches'
--- etc/default-arches 2018-05-22 18:23:25 +0000
+++ etc/default-arches 2018-06-02 01:10:16 +0000
@@ -114,6 +114,8 @@
114xubuntu * feisty-maverick amd64 i386 powerpc powerpc+ps3114xubuntu * feisty-maverick amd64 i386 powerpc powerpc+ps3
115xubuntu * natty- amd64 i386115xubuntu * natty- amd64 i386
116116
117xubuntu-base * * amd64 i386
118
117* daily-live gutsy-intrepid amd64 i386 ia64 powerpc powerpc+ps3 sparc119* daily-live gutsy-intrepid amd64 i386 ia64 powerpc powerpc+ps3 sparc
118* daily-live jaunty amd64 armel i386 ia64 powerpc powerpc+ps3 sparc120* daily-live jaunty amd64 armel i386 ia64 powerpc powerpc+ps3 sparc
119* daily-live karmic amd64 i386 ia64 powerpc powerpc+ps3 sparc121* daily-live karmic amd64 i386 ia64 powerpc powerpc+ps3 sparc
120122
=== modified file 'etc/qa-products'
--- etc/qa-products 2017-10-19 09:55:35 +0000
+++ etc/qa-products 2018-06-02 01:10:16 +0000
@@ -103,5 +103,7 @@
103Ubuntu Kylin Desktop i386 ubuntukylin daily-live desktop i386 iso103Ubuntu Kylin Desktop i386 ubuntukylin daily-live desktop i386 iso
104104
105# Xubuntu105# Xubuntu
106Xubuntu Base amd64 xubuntu-base daily-live base amd64 iso
107Xubuntu Base i386 xubuntu-base daily-live base i386 iso
106Xubuntu Desktop amd64 xubuntu daily-live desktop amd64 iso108Xubuntu Desktop amd64 xubuntu daily-live desktop amd64 iso
107Xubuntu Desktop i386 xubuntu daily-live desktop i386 iso109Xubuntu Desktop i386 xubuntu daily-live desktop i386 iso
108110
=== modified file 'lib/cdimage/build.py'
--- lib/cdimage/build.py 2018-01-09 01:47:28 +0000
+++ lib/cdimage/build.py 2018-06-02 01:10:16 +0000
@@ -100,6 +100,7 @@
100 "ubuntu-mate",100 "ubuntu-mate",
101 "ubuntu-moblin-remix",101 "ubuntu-moblin-remix",
102 "ubuntu-mid",102 "ubuntu-mid",
103 "xubuntu-base",
103 ):104 ):
104 config["CDIMAGE_UNSUPPORTED"] = "1"105 config["CDIMAGE_UNSUPPORTED"] = "1"
105106
106107
=== modified file 'lib/cdimage/germinate.py'
--- lib/cdimage/germinate.py 2018-05-29 03:36:12 +0000
+++ lib/cdimage/germinate.py 2018-06-02 01:10:16 +0000
@@ -81,7 +81,7 @@
81 sources.insert(0, bzrpattern % "ubuntustudio-dev")81 sources.insert(0, bzrpattern % "ubuntustudio-dev")
82 elif project == "mythbuntu":82 elif project == "mythbuntu":
83 sources.insert(0, bzrpattern % "mythbuntu-dev")83 sources.insert(0, bzrpattern % "mythbuntu-dev")
84 elif project == "xubuntu":84 elif project in ("xubuntu", "xubuntu-base"):
85 if series >= "intrepid":85 if series >= "intrepid":
86 sources.insert(0, gitpattern % "xubuntu-dev")86 sources.insert(0, gitpattern % "xubuntu-dev")
87 else:87 else:
8888
=== modified file 'lib/cdimage/project.py'
--- lib/cdimage/project.py 2017-05-01 02:22:20 +0000
+++ lib/cdimage/project.py 2018-06-02 01:10:16 +0000
@@ -36,6 +36,7 @@
36 "kubuntu-plasma5": "Kubuntu-Plasma-5",36 "kubuntu-plasma5": "Kubuntu-Plasma-5",
37 "edubuntu": "Edubuntu",37 "edubuntu": "Edubuntu",
38 "xubuntu": "Xubuntu",38 "xubuntu": "Xubuntu",
39 "xubuntu-base": "Xubuntu-Base",
39 "gobuntu": "Gobuntu",40 "gobuntu": "Gobuntu",
40 "ubuntu-server": "Ubuntu-Server",41 "ubuntu-server": "Ubuntu-Server",
41 "jeos": "Ubuntu-JeOS",42 "jeos": "Ubuntu-JeOS",
4243
=== 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 2018-06-02 01:10:16 +0000
@@ -560,6 +560,7 @@
560 ("edubuntu", "karmic", False, True),560 ("edubuntu", "karmic", False, True),
561 ("xubuntu", "gutsy", False, False),561 ("xubuntu", "gutsy", False, False),
562 ("xubuntu", "hardy", False, True),562 ("xubuntu", "hardy", False, True),
563 ("xubuntu-base", "wily", False, True),
563 ("kubuntu", "precise", False, False),564 ("kubuntu", "precise", False, False),
564 ("kubuntu", "quantal", False, True),565 ("kubuntu", "quantal", False, True),
565 ("kubuntu-active", "raring", False, True),566 ("kubuntu-active", "raring", False, True),
566567
=== modified file 'lib/cdimage/tests/test_germinate.py'
--- lib/cdimage/tests/test_germinate.py 2018-05-29 03:40:05 +0000
+++ lib/cdimage/tests/test_germinate.py 2018-06-02 01:10:16 +0000
@@ -113,6 +113,7 @@
113 ("ubuntu", "raring", ["ubuntu-core-dev"]),113 ("ubuntu", "raring", ["ubuntu-core-dev"]),
114 ("lubuntu", "raring", ["lubuntu-dev", "ubuntu-core-dev"]),114 ("lubuntu", "raring", ["lubuntu-dev", "ubuntu-core-dev"]),
115 ("xubuntu", "intrepid", ["xubuntu-dev", "ubuntu-core-dev"]),115 ("xubuntu", "intrepid", ["xubuntu-dev", "ubuntu-core-dev"]),
116 ("xubuntu-base", "intrepid", ["xubuntu-dev", "ubuntu-core-dev"]),
116 ("ubuntukylin", "utopic", ["ubuntukylin-members", "ubuntu-core-dev"]),117 ("ubuntukylin", "utopic", ["ubuntukylin-members", "ubuntu-core-dev"]),
117 ):118 ):
118 self.config["DIST"] = series119 self.config["DIST"] = series
119120
=== modified file 'lib/cdimage/tests/test_tree.py'
--- lib/cdimage/tests/test_tree.py 2018-05-02 22:06:50 +0000
+++ lib/cdimage/tests/test_tree.py 2018-06-02 01:10:16 +0000
@@ -293,7 +293,8 @@
293 self.assertEqual(publish_type, publisher.publish_type)293 self.assertEqual(publish_type, publisher.publish_type)
294 if "_" not in image_type:294 if "_" not in image_type:
295 self.assertEqual(295 self.assertEqual(
296 image_type, Publisher._guess_image_type(publish_type))296 image_type, Publisher._guess_image_type(publish_type,
297 project))
297298
298299
299class TestPublisherWebIndices(TestCase):300class TestPublisherWebIndices(TestCase):
@@ -750,6 +751,7 @@
750 ("xubuntu", "quantal", "daily-live", "i386", 736665600),751 ("xubuntu", "quantal", "daily-live", "i386", 736665600),
751 ("xubuntu", "raring", "daily-live", "i386", 1073741824),752 ("xubuntu", "raring", "daily-live", "i386", 1073741824),
752 ("xubuntu", "xenial", "daily-live", "i386", 1460000000),753 ("xubuntu", "xenial", "daily-live", "i386", 1460000000),
754 ("xubuntu-base", "bionic", "daily-live", "i386", 736665600),
753 ("ubuntu-gnome", "saucy", "daily-live", "i386", 1073741824),755 ("ubuntu-gnome", "saucy", "daily-live", "i386", 1073741824),
754 ("ubuntu-gnome", "xenial", "daily-live", "i386", 2000000000),756 ("ubuntu-gnome", "xenial", "daily-live", "i386", 2000000000),
755 ("ubuntu-budgie", "zesty", "daily-live", "i386", 2000000000),757 ("ubuntu-budgie", "zesty", "daily-live", "i386", 2000000000),
@@ -1286,6 +1288,7 @@
1286 "Kubuntu Plasma 5 Desktop"),1288 "Kubuntu Plasma 5 Desktop"),
1287 ("edubuntu", "dvd", "dvd", "Edubuntu DVD"),1289 ("edubuntu", "dvd", "dvd", "Edubuntu DVD"),
1288 ("xubuntu", "daily-live", "desktop", "Xubuntu Desktop"),1290 ("xubuntu", "daily-live", "desktop", "Xubuntu Desktop"),
1291 ("xubuntu-base", "daily-live", "base", "Xubuntu Base"),
1289 ("ubuntu-server", "daily", "server", "Ubuntu Server"),1292 ("ubuntu-server", "daily", "server", "Ubuntu Server"),
1290 ("ubuntustudio", "dvd", "dvd", "Ubuntu Studio DVD"),1293 ("ubuntustudio", "dvd", "dvd", "Ubuntu Studio DVD"),
1291 ("mythbuntu", "daily-live", "desktop", "Mythbuntu Desktop"),1294 ("mythbuntu", "daily-live", "desktop", "Mythbuntu Desktop"),
@@ -1359,6 +1362,7 @@
1359 "Kubuntu Plasma 5 Desktop"),1362 "Kubuntu Plasma 5 Desktop"),
1360 ("edubuntu", "dvd", "dvd", "Edubuntu DVD"),1363 ("edubuntu", "dvd", "dvd", "Edubuntu DVD"),
1361 ("xubuntu", "daily-live", "desktop", "Xubuntu Desktop"),1364 ("xubuntu", "daily-live", "desktop", "Xubuntu Desktop"),
1365 ("xubuntu-base", "daily-live", "base", "Xubuntu Base"),
1362 ("ubuntu-server", "daily", "server", "Ubuntu Server"),1366 ("ubuntu-server", "daily", "server", "Ubuntu Server"),
1363 ("ubuntustudio", "dvd", "dvd", "Ubuntu Studio DVD"),1367 ("ubuntustudio", "dvd", "dvd", "Ubuntu Studio DVD"),
1364 ("mythbuntu", "daily-live", "desktop", "Mythbuntu Desktop"),1368 ("mythbuntu", "daily-live", "desktop", "Mythbuntu Desktop"),
13651369
=== modified file 'lib/cdimage/tree.py'
--- lib/cdimage/tree.py 2018-04-26 23:41:37 +0000
+++ lib/cdimage/tree.py 2018-06-02 01:10:16 +0000
@@ -82,6 +82,7 @@
82 "ubuntukylin",82 "ubuntukylin",
83 "ubuntustudio",83 "ubuntustudio",
84 "xubuntu",84 "xubuntu",
85 "xubuntu-base",
85]86]
8687
8788
@@ -161,6 +162,8 @@
161 """Return the per-project base directory within this tree."""162 """Return the per-project base directory within this tree."""
162 if self.config.project == "ubuntu":163 if self.config.project == "ubuntu":
163 return self.directory164 return self.directory
165 elif self.config.project == "xubuntu-base":
166 return os.path.join(self.directory, "xubuntu")
164 else:167 else:
165 return os.path.join(self.directory, self.config.project)168 return os.path.join(self.directory, self.config.project)
166169
@@ -253,7 +256,7 @@
253 config["IMAGE_TYPE"] = options.image_type256 config["IMAGE_TYPE"] = options.image_type
254 elif options.publish_type:257 elif options.publish_type:
255 config["IMAGE_TYPE"] = DailyTreePublisher._guess_image_type(258 config["IMAGE_TYPE"] = DailyTreePublisher._guess_image_type(
256 options.publish_type)259 options.publish_type, options.project)
257 if not config["IMAGE_TYPE"]:260 if not config["IMAGE_TYPE"]:
258 parser.error(261 parser.error(
259 "unrecognised publish type '%s'" % options.publish_type)262 "unrecognised publish type '%s'" % options.publish_type)
@@ -406,6 +409,8 @@
406 return "live-server"409 return "live-server"
407 elif self.project == "ubuntu-core":410 elif self.project == "ubuntu-core":
408 return "live-core"411 return "live-core"
412 elif self.project == "xubuntu-base":
413 return "base"
409 else:414 else:
410 if self.config["DIST"] <= "breezy":415 if self.config["DIST"] <= "breezy":
411 return "live"416 return "live"
@@ -438,13 +443,15 @@
438443
439 # Keep this in sync with publish_type above.444 # Keep this in sync with publish_type above.
440 @staticmethod445 @staticmethod
441 def _guess_image_type(publish_type):446 def _guess_image_type(publish_type, project = None):
442 if publish_type.startswith("preinstalled-"):447 if publish_type.startswith("preinstalled-"):
443 return "daily-preinstalled"448 return "daily-preinstalled"
444 elif publish_type in (449 elif publish_type in (
445 "desktop", "live", "mid", "moblin-remix", "netbook",450 "desktop", "live", "mid", "moblin-remix", "netbook",
446 "live-core", "live-server"):451 "live-core", "live-server"):
447 return "daily-live"452 return "daily-live"
453 elif publish_type == "base" and project == "xubuntu-base":
454 return "daily-live"
448 elif publish_type == "dvd":455 elif publish_type == "dvd":
449 return "dvd"456 return "dvd"
450 elif publish_type in (457 elif publish_type in (
@@ -501,6 +508,8 @@
501 return "Ubuntu Core %s" % cd508 return "Ubuntu Core %s" % cd
502 elif publish_type == "desktop":509 elif publish_type == "desktop":
503 return "desktop %s" % cd510 return "desktop %s" % cd
511 elif publish_type == "base":
512 return "base %s" % cd
504 elif publish_type == "install":513 elif publish_type == "install":
505 return "install %s" % cd514 return "install %s" % cd
506 elif publish_type == "alternate":515 elif publish_type == "alternate":
@@ -558,7 +567,7 @@
558 if self.project == "mid":567 if self.project == "mid":
559 # MID has lower memory requirements than others568 # MID has lower memory requirements than others
560 desktop_ram = 128569 desktop_ram = 128
561 if self.project == "xubuntu":570 if self.project in ("xubuntu", "xubuntu-base"):
562 if series <= "intrepid":571 if series <= "intrepid":
563 desktop_ram = 128572 desktop_ram = 128
564 else:573 else:
@@ -622,6 +631,11 @@
622 sentences.append(631 sentences.append(
623 "You can install additional educational programs using "632 "You can install additional educational programs using "
624 "the classroom server add-on %s." % cd)633 "the classroom server add-on %s." % cd)
634 elif publish_type == "base" and self.project == "xubuntu-base":
635 sentences.append(
636 "The base %s allows you to try %s without changing your "
637 "computer at all, and at your option to install it "
638 "permanently later." % (cd, capproject))
625 elif publish_type == "install":639 elif publish_type == "install":
626 sentences.append(640 sentences.append(
627 "The install %s allows you to install %s permanently on a "641 "The install %s allows you to install %s permanently on a "
@@ -1136,6 +1150,7 @@
11361150
1137 all_publish_types = (1151 all_publish_types = (
1138 "live", "desktop",1152 "live", "desktop",
1153 "base",
1139 "live-server",1154 "live-server",
1140 "server", "install", "alternate",1155 "server", "install", "alternate",
1141 "serveraddon", "addon",1156 "serveraddon", "addon",

Subscribers

People subscribed via source and target branches