Merge lp:~mvo/click/ubuntu-core-framework into lp:click/devel

Proposed by Michael Vogt on 2014-11-13
Status: Merged
Merged at revision: 545
Proposed branch: lp:~mvo/click/ubuntu-core-framework
Merge into: lp:click/devel
Diff against target: 29 lines (+7/-0)
1 file modified
click/chroot.py (+7/-0)
To merge this branch: bzr merge lp:~mvo/click/ubuntu-core-framework
Reviewer Review Type Date Requested Status
Colin Watson 2014-11-13 Approve on 2014-11-13
PS Jenkins bot (community) continuous-integration Needs Fixing on 2014-11-13
Review via email: mp+241664@code.launchpad.net

Commit message

Add "ubuntu-core-15.04-dev1 framework"

Description of the change

This branch adds the ubuntu-core-15.04-dev1 framework as a available chroot option.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:537
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mvo/click/ubuntu-core-framework/+merge/241664/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/click-devel-ci/119/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-devel-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-devel-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/click-devel-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-devel-vivid-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/click-devel-ci/119/rebuild

review: Needs Fixing (continuous-integration)
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 'click/chroot.py'
2--- click/chroot.py 2014-10-30 11:36:12 +0000
3+++ click/chroot.py 2014-11-13 10:21:56 +0000
4@@ -50,6 +50,8 @@
5 "ubuntu-sdk-15.04-html": "ubuntu-sdk-15.04",
6 "ubuntu-sdk-15.04-papi": "ubuntu-sdk-15.04",
7 "ubuntu-sdk-15.04-qml": "ubuntu-sdk-15.04",
8+ # core
9+ "ubuntu-core-15.04-dev1": "ubuntu-core-15.04",
10 }
11
12
13@@ -58,6 +60,7 @@
14 "ubuntu-sdk-14.04": "trusty",
15 "ubuntu-sdk-14.10": "utopic",
16 "ubuntu-sdk-15.04": "vivid",
17+ "ubuntu-core-15.04": "vivid",
18 }
19
20
21@@ -169,6 +172,10 @@
22 "ubuntu-sdk-libs:TARGET",
23 "ubuntu-sdk-libs-dev:TARGET",
24 ],
25+ "ubuntu-core-15.04-dev1": [
26+ "ubuntu-core-libs:TARGET",
27+ "ubuntu-core-libs-dev:TARGET",
28+ ],
29 }
30
31

Subscribers

People subscribed via source and target branches

to all changes: