Autopilot

Merge lp:~canonical-platform-qa/autopilot/pdf-build into lp:autopilot

  1. pdf-build
  2. Merge into trunk
Proposed by Allan LeSage on 2015-01-22
Status: Needs review
Proposed branch: lp:~canonical-platform-qa/autopilot/pdf-build
Merge into: lp:autopilot
Diff against target: 96 lines (+17/-6)
3 files modified
debian/control (+3/-0)
debian/rules (+9/-1)
docs/man.rst (+5/-5)
To merge this branch: bzr merge lp:~canonical-platform-qa/autopilot/pdf-build
Reviewer Review Type Date Requested Status
platform-qa-bot continuous-integration Approve on 2016-01-19
PS Jenkins bot continuous-integration Approve on 2015-01-26
Martin Pitt (community) Needs Fixing on 2015-01-23
Thomi Richards (community) 2015-01-22 Approve on 2015-01-22
Review via email: mp+247249@code.launchpad.net

Commit Message

Provide pdf build.

Description of the Change

Provide pdf-building via LaTeX.

Required minor modification for a unicode char unprovided-for. Where/how would we want to install the result?

This'll be on hold until I fix a noodly Makefile/bash issue (marked as FIXME in debian/rules), but wanting to get some feedback.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Reply
lp:~canonical-platform-qa/autopilot/pdf-build updated on 2015-01-22
530. By Allan LeSage on 2015-01-22

Correct .svg extensions.

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Reply
lp:~canonical-platform-qa/autopilot/pdf-build updated on 2015-01-22
531. By Allan LeSage on 2015-01-22

Revert whitespace change.

532. By Allan LeSage on 2015-01-22

Makefile hackery to convert .svgs to .pdf, revert wildcard .svg change, add imagemagick build-dep.

533. By Allan LeSage on 2015-01-22

Merge trunk.

534. By Allan LeSage on 2015-01-22

Clean up debian/rules comments :/ .

Allan LeSage (allanlesage) wrote :

To build/test, just do a normal debian build--the .pdf arrives in build/sphinx/latex/Autopilot.pdf , else just follow the steps listed in debian/rules. Note that you'll need the added dependencies.

Also note that the man.rst changes convert that unicode em-dash to a normal hyphen, wasn't supported during the LaTeX generation.

Reply
lp:~canonical-platform-qa/autopilot/pdf-build updated on 2015-01-22
535. By Allan LeSage on 2015-01-22

debian/control whitespace fix.

Thomi Richards (thomir) wrote :

LGTM, but I'd like to see someone review the packaging bits.

Cheers,

review: Approve
Reply
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Reply
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Reply
Martin Pitt (pitti) wrote :

The packaging in debian/rules looks fine to me. However, it fails to build:

   debian/rules override_dh_auto_build
make[1]: Entering directory '/«BUILDDIR»/autopilot-1.5.0+14.10.20140806'
convert /«BUILDDIR»/autopilot-1.5.0+14.10.20140806/docs/images/test_pyramid.svg /«BUILDDIR»/autopilot-1.5.0+14.10.20140806/docs/images/test_pyramid.pdf
convert: delegate failed `"rsvg-convert" -o "%o" "%i"' @ error/delegate.c/InvokeDelegate/1310.
convert: unable to open image `/tmp/magick-28976RCFje6T2VDtX': No such file or directory @ error/blob.c/OpenBlob/2709.
convert: unable to open file `/tmp/magick-28976RCFje6T2VDtX': No such file or directory @ error/constitute.c/ReadImage/540.
convert: no images defined `/«BUILDDIR»/autopilot-1.5.0+14.10.20140806/docs/images/test_pyramid.pdf' @ error/convert.c/ConvertImageCommand/3210.
make[1]: *** [/«BUILDDIR»/autopilot-1.5.0+14.10.20140806/docs/images/test_pyramid.pdf] Error 1
debian/rules:8: recipe for target '/«BUILDDIR»/autopilot-1.5.0+14.10.20140806/docs/images/test_pyramid.pdf' failed
make[1]: Leaving directory '/«BUILDDIR»/autopilot-1.5.0+14.10.20140806'
make: *** [build] Error 2
debian/rules:14: recipe for target 'build' failed

Maybe that's still missing some build dep?

I can't quite see what changed in docs/man.rst, that seems to be some whitespace noise?

review: Needs Fixing
Reply
lp:~canonical-platform-qa/autopilot/pdf-build updated on 2015-01-23
536. By Allan LeSage on 2015-01-23

Add librsvg2-bin build-dep.

Allan LeSage (allanlesage) wrote :

Mysterious missing dependency; this builds under pbuilder; we'll wait for Jenkins' approval--thanks for your notes pitti.

Reply
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Reply
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:536
http://jenkins.qa.ubuntu.com/job/autopilot-ci/1005/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-amd64-ci/68/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-armhf-ci/68
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-armhf-ci/68/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-i386-ci/68
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-i386-ci/68/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid-autopilot/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid-autopilot/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/562
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/562/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Reply
Francis Ginther (fginther) wrote :

The jenkins node for the amd64 build failed, I've restarted a new ci run.

Reply
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:536
http://jenkins.qa.ubuntu.com/job/autopilot-ci/1007/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-amd64-ci/70
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-amd64-ci/70/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-armhf-ci/70
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-armhf-ci/70/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-i386-ci/70
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-i386-ci/70/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1003
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid-autopilot/100
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/888
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1001
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1001/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17473
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid-autopilot/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/570
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/570/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Reply
Nicholas Skaggs (nskaggs) wrote :

Unsure as to why there are newline changes in docs/man.rst. But otherwise, LGTM. Did you find texlive-fonts-recommended required? Is our font special?

Reply
platform-qa-bot (platform-qa-bot) wrote :
review: Approve (continuous-integration)
Reply

Unmerged revisions

536. By Allan LeSage on 2015-01-23

Add librsvg2-bin build-dep.

535. By Allan LeSage on 2015-01-22

debian/control whitespace fix.

534. By Allan LeSage on 2015-01-22

Clean up debian/rules comments :/ .

533. By Allan LeSage on 2015-01-22

Merge trunk.

532. By Allan LeSage on 2015-01-22

Makefile hackery to convert .svgs to .pdf, revert wildcard .svg change, add imagemagick build-dep.

531. By Allan LeSage on 2015-01-22

Revert whitespace change.

530. By Allan LeSage on 2015-01-22

Correct .svg extensions.

529. By Allan LeSage on 2015-01-22

Provide for pdf in debian-build.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-10-30 08:10:12 +0000
3+++ debian/control 2015-01-23 16:16:27 +0000
4@@ -11,9 +11,11 @@
5 gir1.2-ibus-1.0,
6 gir1.2-ubuntu-app-launch-2 | gir1.2-upstart-app-launch-2,
7 graphviz,
8+ imagemagick,
9 libjs-jquery,
10 libjs-underscore,
11 liblttng-ust-dev,
12+ librsvg2-bin,
13 python3-all-dev (>= 3.4),
14 python3-dateutil,
15 python3-dbus,
16@@ -32,6 +34,7 @@
17 python3-testtools,
18 python3-xlib,
19 sphinx-common,
20+ texlive-fonts-recommended,
21 texlive-latex-extra,
22 Standards-Version: 3.9.5
23 Homepage: https://launchpad.net/autopilot
24
25=== modified file 'debian/rules' (properties changed: -x to +x)
26--- debian/rules 2014-07-23 03:37:24 +0000
27+++ debian/rules 2015-01-23 16:16:27 +0000
28@@ -4,6 +4,12 @@
29 # Uncomment this to turn on verbose mode.
30 # export DH_VERBOSE=1
31
32+%.pdf : %.svg
33+ convert $< $@
34+
35+# find .svgs, make list of .pdfs to generate
36+PDFs := $(patsubst %.svg,%.pdf,$(wildcard $(CURDIR)/docs/images/*.svg))
37+
38 %:
39 dh $@ --with python3,sphinxdoc --buildsystem=pybuild
40
41@@ -11,11 +17,13 @@
42 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=745690
43 -dh_sphinxdoc
44
45-override_dh_auto_build:
46+override_dh_auto_build: $(PDFs)
47 python3 -m flake8.run .
48 dh_auto_build
49 python3 setup.py build_sphinx -b html
50 python3 setup.py build_sphinx -b man
51+ python3 setup.py build_sphinx -b latex
52+ $(MAKE) -C $(CURDIR)/build/sphinx/latex all-pdf
53
54 override_dh_auto_test:
55 ifeq (, $(findstring nocheck, $(DEB_BUILD_OPTIONS)))
56
57=== modified file 'docs/man.rst'
58--- docs/man.rst 2015-01-21 05:28:45 +0000
59+++ docs/man.rst 2015-01-23 16:16:27 +0000
60@@ -16,8 +16,8 @@
61 General Options
62 -h, --help
63 Get help from autopilot. This command can also be present after a
64- sub-command (such as run or list) to get help on the specific com‐
65- mand. Further options are restricted to particular autopilot com‐
66+ sub-command (such as run or list) to get help on the specific com-
67+ mand. Further options are restricted to particular autopilot com-
68 mands.
69
70 -v, --version
71@@ -35,7 +35,7 @@
72 See `SPECIFYING SUITES`_
73
74 -ro, --run-order
75- List tests in the order they will be run in, rather than alphabet‐
76+ List tests in the order they will be run in, rather than alphabet-
77 ically (which is the default).
78
79 --suites
80@@ -49,7 +49,7 @@
81
82 -o FILE, --output FILE
83 Specify where the test log should be written. Defaults to stdout.
84- If a directory is specified the file will be created with a file‐
85+ If a directory is specified the file will be created with a file-
86 name of <hostname>_<dd.mm.yyy_HHMMSS>.log
87
88 -f FORMAT, --format FORMAT
89@@ -60,7 +60,7 @@
90 Stop the test run on the first error or failure.
91
92 -r, --record
93- Record failed tests. Using this option requires the 'recordmydesk‐
94+ Record failed tests. Using this option requires the 'recordmydesk-
95 top' application be installed. By default, videos are stored in
96 /tmp/autopilot
97

Subscribers

People subscribed via source and target branches