Merge lp:~mwhudson/ubuntu-cdimage/no-live-server-proposed into lp:ubuntu-cdimage

Proposed by Michael Hudson-Doyle
Status: Merged
Merged at revision: 1866
Proposed branch: lp:~mwhudson/ubuntu-cdimage/no-live-server-proposed
Merge into: lp:ubuntu-cdimage
Diff against target: 21 lines (+2/-2)
1 file modified
etc/crontab (+2/-2)
To merge this branch: bzr merge lp:~mwhudson/ubuntu-cdimage/no-live-server-proposed
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+383744@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

looks like you're only changing this for the devel series where we don't do PROPOSED=1 by default, and not for DIST=focal where we /do/ have PROPOSED=1 by default?

review: Needs Fixing
1867. By Michael Hudson-Doyle

put PROPOSED=0 in the right place

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

oops. fixed i think?

Revision history for this message
Steve Langasek (vorlon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'etc/crontab'
--- etc/crontab 2020-05-07 00:49:06 +0000
+++ etc/crontab 2020-05-11 22:25:27 +0000
@@ -20,7 +20,7 @@
2051 7 * * * DIST=bionic for-project ubuntu cron.daily-live --live2051 7 * * * DIST=bionic for-project ubuntu cron.daily-live --live
2134 5 * * * DIST=bionic for-project kubuntu cron.daily-live --live2134 5 * * * DIST=bionic for-project kubuntu cron.daily-live --live
2230 1 * * * DIST=bionic for-project xubuntu cron.daily-live --live2230 1 * * * DIST=bionic for-project xubuntu cron.daily-live --live
2359 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 --live2359 6 * * * DIST=bionic for-project ubuntu-server cron.daily --live; DIST=bionic for-project ubuntu-server cron.daily-preinstalled --live; DIST=bionic SUBPROJECT=live PROPOSED=0 for-project ubuntu-server cron.daily-live --live
2459 16 * * * DIST=bionic for-project lubuntu cron.daily-live --live2459 16 * * * DIST=bionic for-project lubuntu cron.daily-live --live
25# The daily ubuntu-base bionic images are used by core18, so we can't build it25# The daily ubuntu-base bionic images are used by core18, so we can't build it
26# with proposed enabled.26# with proposed enabled.
@@ -32,7 +32,7 @@
3231 7 * * * DIST=focal for-project ubuntu cron.daily-live --live; DIST=focal SUBPROJECT=canary EXTRA_PPAS=ubuntu-desktop/canary-image for-project ubuntu cron.daily-live --live3231 7 * * * DIST=focal for-project ubuntu cron.daily-live --live; DIST=focal SUBPROJECT=canary EXTRA_PPAS=ubuntu-desktop/canary-image for-project ubuntu cron.daily-live --live
3314 5 * * * DIST=focal for-project kubuntu cron.daily-live --live3314 5 * * * DIST=focal for-project kubuntu cron.daily-live --live
3450 1 * * * DIST=focal for-project xubuntu cron.daily-live --live3450 1 * * * DIST=focal for-project xubuntu cron.daily-live --live
3529 6 * * * DIST=focal for-project ubuntu-server cron.daily --live; DIST=focal for-project ubuntu-server cron.daily-preinstalled --live; DIST=focal SUBPROJECT=live for-project ubuntu-server cron.daily-live --live3529 6 * * * DIST=focal for-project ubuntu-server cron.daily --live; DIST=focal for-project ubuntu-server cron.daily-preinstalled --live; DIST=focal SUBPROJECT=live PROPOSED=0 for-project ubuntu-server cron.daily-live --live
3617 18 * * * DIST=focal for-project ubuntustudio cron.dvd --live3617 18 * * * DIST=focal for-project ubuntustudio cron.dvd --live
3729 16 * * * DIST=focal for-project lubuntu cron.daily-live --live3729 16 * * * DIST=focal for-project lubuntu cron.daily-live --live
38# The daily ubuntu-base focal images are used by core20, so we can't build it38# The daily ubuntu-base focal images are used by core20, so we can't build it

Subscribers

People subscribed via source and target branches