Ubuntu CD Images

Merge lp:~sil2100/ubuntu-cdimage/enable_wily_overlay into lp:ubuntu-cdimage

  1. enable_wily_overlay
  2. Merge into mainline
Proposed by Łukasz Zemczak on 2015-10-02
Status: Merged
Merged at revision: 1544
Proposed branch: lp:~sil2100/ubuntu-cdimage/enable_wily_overlay
Merge into: lp:ubuntu-cdimage
Diff against target: 26 lines (+4/-2)
2 files modified
bin/rebuild-requests (+2/-1)
etc/crontab (+2/-1)
To merge this branch: bzr merge lp:~sil2100/ubuntu-cdimage/enable_wily_overlay
Reviewer Review Type Date Requested Status
Colin Watson 2015-10-02 Approve on 2015-10-02
Review via email: mp+273208@code.launchpad.net

Commit Message

As per the product team decision, we now build ubuntu-touch/pd wily images with the overlay PPA enabled.

Description of the Change

As per the product team decision, we now build ubuntu-touch/pd wily images with the overlay PPA enabled.

To post a comment you must log in.
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/rebuild-requests'
2--- bin/rebuild-requests 2015-09-18 17:35:25 +0000
3+++ bin/rebuild-requests 2015-10-02 10:28:48 +0000
4@@ -132,7 +132,8 @@
5 if sub_project:
6 env['SUBPROJECT'] = sub_project
7
8- if project in ("ubuntu-touch", "ubuntu-pd") and args[0] == "vivid":
9+ if (project in ("ubuntu-touch", "ubuntu-pd") and
10+ args[0] in ("vivid", "wily")):
11 env['EXTRA_PPAS'] = \
12 "ci-train-ppa-service/stable-phone-overlay:1001"
13
14
15=== modified file 'etc/crontab'
16--- etc/crontab 2015-08-18 23:14:18 +0000
17+++ etc/crontab 2015-10-02 10:28:48 +0000
18@@ -39,7 +39,8 @@
19
20 # XXX: Note that the EXTRA_PPAS bit here also needs to be mirrored in rebuild-requests:
21 03 2 * * 1-5 DIST=vivid EXTRA_PPAS=ci-train-ppa-service/stable-phone-overlay:1001 for-project ubuntu-touch cron.daily-preinstalled --live
22-04 2 * * * for-project ubuntu-touch cron.daily-preinstalled --live
23+# wily ubuntu-touch builds now use the overlay-ppa as well
24+04 2 * * * EXTRA_PPAS=ci-train-ppa-service/stable-phone-overlay:1001 for-project ubuntu-touch cron.daily-preinstalled --live
25
26 */15 * * * * mirror-image-build-logs
27

Subscribers

People subscribed via source and target branches