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

Proposed by Michael Vogt
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 Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
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.
Revision history for this message
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)
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'click/chroot.py'
--- click/chroot.py 2014-10-30 11:36:12 +0000
+++ click/chroot.py 2014-11-13 10:21:56 +0000
@@ -50,6 +50,8 @@
50 "ubuntu-sdk-15.04-html": "ubuntu-sdk-15.04",50 "ubuntu-sdk-15.04-html": "ubuntu-sdk-15.04",
51 "ubuntu-sdk-15.04-papi": "ubuntu-sdk-15.04",51 "ubuntu-sdk-15.04-papi": "ubuntu-sdk-15.04",
52 "ubuntu-sdk-15.04-qml": "ubuntu-sdk-15.04",52 "ubuntu-sdk-15.04-qml": "ubuntu-sdk-15.04",
53 # core
54 "ubuntu-core-15.04-dev1": "ubuntu-core-15.04",
53 }55 }
5456
5557
@@ -58,6 +60,7 @@
58 "ubuntu-sdk-14.04": "trusty",60 "ubuntu-sdk-14.04": "trusty",
59 "ubuntu-sdk-14.10": "utopic",61 "ubuntu-sdk-14.10": "utopic",
60 "ubuntu-sdk-15.04": "vivid",62 "ubuntu-sdk-15.04": "vivid",
63 "ubuntu-core-15.04": "vivid",
61 }64 }
6265
6366
@@ -169,6 +172,10 @@
169 "ubuntu-sdk-libs:TARGET",172 "ubuntu-sdk-libs:TARGET",
170 "ubuntu-sdk-libs-dev:TARGET",173 "ubuntu-sdk-libs-dev:TARGET",
171 ],174 ],
175 "ubuntu-core-15.04-dev1": [
176 "ubuntu-core-libs:TARGET",
177 "ubuntu-core-libs-dev:TARGET",
178 ],
172 }179 }
173180
174181

Subscribers

People subscribed via source and target branches

to all changes: