Autopilot

Merge lp:~nskaggs/autopilot/add-json-build into lp:autopilot

  1. add-json-build
  2. Merge into trunk
Proposed by Nicholas Skaggs
Status: Merged
Approved by: Christopher Lee
Approved revision: 542
Merged at revision: 541
Proposed branch: lp:~nskaggs/autopilot/add-json-build
Merge into: lp:autopilot
Diff against target: 18 lines (+2/-0)
2 files modified
debian/python3-autopilot.docs (+1/-0)
debian/rules (+1/-0)
To merge this branch: bzr merge lp:~nskaggs/autopilot/add-json-build
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Christopher Lee (community) Approve
Review via email: mp+247912@code.launchpad.net

Commit message

Add json to autopilot package

Description of the change

Add json to autopilot package

To post a comment you must log in.
Revision history for this message
Christopher Lee (veebers) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:542
http://jenkins.qa.ubuntu.com/job/autopilot-ci/1012/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-amd64-ci/75
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-amd64-ci/75/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-armhf-ci/75
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-armhf-ci/75/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-i386-ci/75
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-i386-ci/75/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1065
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid-autopilot/107
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/944
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1063
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1063/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17585
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid-autopilot/103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/605
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/605/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/1012/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/python3-autopilot.docs'
2--- debian/python3-autopilot.docs 2014-05-01 23:41:32 +0000
3+++ debian/python3-autopilot.docs 2015-01-28 22:50:05 +0000
4@@ -1,1 +1,2 @@
5 build/sphinx/html/
6+build/sphinx/json/
7
8=== modified file 'debian/rules'
9--- debian/rules 2014-07-23 03:37:24 +0000
10+++ debian/rules 2015-01-28 22:50:05 +0000
11@@ -15,6 +15,7 @@
12 python3 -m flake8.run .
13 dh_auto_build
14 python3 setup.py build_sphinx -b html
15+ python3 setup.py build_sphinx -b json
16 python3 setup.py build_sphinx -b man
17
18 override_dh_auto_test:

Subscribers

People subscribed via source and target branches