Ubuntu CD Images

Merge lp:~tsimonq2/ubuntu-cdimage/drop-lubuntu-next into lp:ubuntu-cdimage

  1. drop-lubuntu-next
  2. Merge into mainline
Proposed by Simon Quigley
Status: Merged
Merged at revision: 1724
Proposed branch: lp:~tsimonq2/ubuntu-cdimage/drop-lubuntu-next
Merge into: lp:ubuntu-cdimage
Diff against target: 38 lines (+4/-4)
2 files modified
etc/crontab (+2/-2)
lib/cdimage/germinate.py (+2/-2)
To merge this branch: bzr merge lp:~tsimonq2/ubuntu-cdimage/drop-lubuntu-next
Reviewer Review Type Date Requested Status
Ubuntu CD Image Team Pending
Review via email: mp+345064@code.launchpad.net

Commit message

Drop Lubuntu Next builds.

Description of the change

Lubuntu Next doesn't need Bionic builds because it didn't and doesn't get a release, and it doesn't need Cosmic builds because Lubuntu Next is now Lubuntu.

To post a comment you must log in.
lp:~tsimonq2/ubuntu-cdimage/drop-lubuntu-next updated
1725. By Simon Quigley

Also fix germination of seeds so that the mangling workaround isn't done on Cosmic.

Revision history for this message
Simon Quigley (tsimonq2) wrote :

In an additional commit I just pushed that should be merged as part of this (although not strictly related), Germination is fixed so that the hacky workarounds done for the split seed don't mess with Cosmic generation.

Although the change for lubuntu-next isn't *really* needed because there is no longer images generated, I think it's good for the sake of completion.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'etc/crontab'
2--- etc/crontab 2018-05-02 22:40:52 +0000
3+++ etc/crontab 2018-05-04 04:16:45 +0000
4@@ -23,7 +23,7 @@
5 34 5 * * * DIST=bionic for-project kubuntu cron.daily-live --live
6 30 1 * * * DIST=bionic for-project xubuntu cron.daily-live --live
7 59 6 * * * DIST=bionic for-project ubuntu-server cron.daily --live; DIST=bionic for-project ubuntu-server cron.daily-preinstalled --live; DIST=bionic SUBPROJECT=live for-project ubuntu-server cron.daily-live --live
8-59 16 * * * DIST=bionic for-project lubuntu cron.daily-live --live; DIST=bionic for-project lubuntu-next cron.daily-live --live
9+59 16 * * * DIST=bionic for-project lubuntu cron.daily-live --live
10 52 4 * * * DIST=bionic for-project ubuntu-base cron.daily-live --live
11 34 22 * * * DIST=bionic for-project ubuntukylin cron.daily-live --live
12 20 15 * * * DIST=bionic for-project ubuntu-budgie cron.daily-live --live
13@@ -35,7 +35,7 @@
14 50 1 * * * for-project xubuntu cron.daily-live --live
15 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
16 17 18 * * * for-project ubuntustudio cron.dvd --live
17-29 16 * * * for-project lubuntu cron.daily-live --live; for-project lubuntu-next cron.daily-live --live
18+29 16 * * * for-project lubuntu cron.daily-live --live
19 32 4 * * * for-project ubuntu-base cron.daily-live --live
20 14 22 * * * for-project ubuntukylin cron.daily-live --live
21 00 15 * * * for-project ubuntu-budgie cron.daily-live --live
22
23=== modified file 'lib/cdimage/germinate.py'
24--- lib/cdimage/germinate.py 2018-01-08 04:57:00 +0000
25+++ lib/cdimage/germinate.py 2018-05-04 04:16:45 +0000
26@@ -363,10 +363,10 @@
27 elif mode == "ship-live":
28 if project == "kubuntu-active":
29 yield "ship-active-live"
30- elif project == "lubuntu" and series >= "artful":
31+ elif project == "lubuntu" and series >= "artful" and series <= "bionic":
32 yield "ship-live-gtk"
33 yield "ship-live-share"
34- elif project == "lubuntu-next" and series >= "artful":
35+ elif project == "lubuntu-next" and series >= "artful" and series <= "bionic":
36 yield "ship-live-qt"
37 yield "ship-live-share"
38 else:

Subscribers

People subscribed via source and target branches