Merge lp:~allanlesage/cupstream2distro-config/enable-webcred-coverage into lp:cupstream2distro-config

Proposed by Allan LeSage
Status: Merged
Approved by: Francis Ginther
Approved revision: 1126
Merged at revision: 1135
Proposed branch: lp:~allanlesage/cupstream2distro-config/enable-webcred-coverage
Merge into: lp:cupstream2distro-config
Diff against target: 117 lines (+52/-5)
2 files modified
stacks/head/settings.cfg (+9/-3)
stacks/head/webcred.cfg (+43/-2)
To merge this branch: bzr merge lp:~allanlesage/cupstream2distro-config/enable-webcred-coverage
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Francis Ginther Approve
Review via email: mp+219606@code.launchpad.net

Commit message

Enable coverage for webcred.

Description of the change

Enable coverage for webcred, working from a list that fginther gave me, others in that list need a bit of love before being added; we can either add those (account-plugins, gnome-control-center-signon, libaccounts-glib) to this MP or treat separately.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1124
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/~allanlesage/cupstream2distro-config/enable-webcred-coverage/+merge/219606/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/694/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-utopic-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-utopic-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cupstream2distro-config-ci/694/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

All of the hooks lines need H05set_package_version. I think I caught them all in the inline comments below.

Also all projects which are having coverage.xml added to the archived artifacts need to have the following added:
    configurations:
      utopic-armhf:
        archive_artifacts: '**/output/*deb, **/coverage.xml'

This is needed because the ci_default block at the top of the stack is set to only collect the deb files. When adding coverage, this needs to collect the deb files and the xml files.

review: Needs Fixing
Revision history for this message
Francis Ginther (fginther) wrote :

In case I forgot the inline comments.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Looks good, thanks for the update.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Must have hit an approve race, let's try again.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stacks/head/settings.cfg'
2--- stacks/head/settings.cfg 2014-06-04 18:53:57 +0000
3+++ stacks/head/settings.cfg 2014-06-05 14:53:19 +0000
4@@ -38,9 +38,15 @@
5 publish_coverage: '**/results/coverage.xml'
6 publish_junit: '**/*test*.xml'
7 ubuntu-system-settings-online-accounts:
8- daily_release: False
9- autolanding_template: False
10- use_stack_ppa: False
11+ daily_release: False
12+ autolanding_template: False
13+ use_stack_ppa: False
14+ hooks: H05set_package_version H10enable_coverage D10install_lcov B09qmakecoverage D09add_ppa~gcovr-team~ppa D10install_gcovr B10gcovr_run C09copy_results
15+ archive_artifacts: '**/coverage.xml'
16+ publish_coverage: '**/coverage.xml'
17+ configurations:
18+ utopic-armhf:
19+ archive_artifacts: '**/output/*deb, **/coverage.xml'
20 gsettings-qt:
21 daily_release: False
22 autolanding_template: False
23
24=== modified file 'stacks/head/webcred.cfg'
25--- stacks/head/webcred.cfg 2014-06-04 18:53:57 +0000
26+++ stacks/head/webcred.cfg 2014-06-05 14:53:19 +0000
27@@ -29,11 +29,22 @@
28 daily_release: False
29 autolanding_template: False
30 use_stack_ppa: False
31- hooks: H05set_package_version
32+ hooks: H05set_package_version H10enable_coverage D10install_lcov B09qmakecoverage D09add_ppa~gcovr-team~ppa D10install_gcovr B10gcovr_run C09copy_results
33+ archive_artifacts: '**/coverage.xml'
34+ publish_coverage: '**/coverage.xml'
35+ configurations:
36+ utopic-armhf:
37+ archive_artifacts: '**/output/*deb, **/coverage.xml'
38 gnome-control-center-signon:
39 daily_release: False
40 autolanding_template: False
41 use_stack_ppa: False
42+ hooks: H05set_package_version H10enable_coverage D10install_lcov B09qmakecoverage D09add_ppa~gcovr-team~ppa D10install_gcovr B10gcovr_run C09copy_results
43+ archive_artifacts: '**/coverage.xml'
44+ publish_coverage: '**/coverage.xml'
45+ configurations:
46+ utopic-armhf:
47+ archive_artifacts: '**/output/*deb, **/coverage.xml'
48 libaccounts-glib:
49 daily_release: False
50 autolanding_template: False
51@@ -45,6 +56,12 @@
52 daily_release: False
53 autolanding_template: False
54 use_stack_ppa: False
55+ hooks: H05set_package_version H10enable_coverage D10install_lcov B09qmakecoverage D09add_ppa~gcovr-team~ppa D10install_gcovr B10gcovr_run C09copy_results
56+ archive_artifacts: '**/coverage.xml'
57+ publish_coverage: '**/coverage.xml'
58+ configurations:
59+ utopic-armhf:
60+ archive_artifacts: '**/output/*deb, **/coverage.xml'
61 libsignon-glib:
62 daily_release: False
63 autolanding_template: False
64@@ -53,11 +70,22 @@
65 daily_release: False
66 autolanding_template: False
67 use_stack_ppa: False
68- hooks: H05set_package_version H40native_hack.py
69+ hooks: H05set_package_version H40native_hack.py H10enable_coverage D10install_lcov B09qmakecoverage D09add_ppa~gcovr-team~ppa D10install_gcovr B10gcovr_run C09copy_results
70+ archive_artifacts: '**/coverage.xml'
71+ publish_coverage: '**/coverage.xml'
72+ configurations:
73+ utopic-armhf:
74+ archive_artifacts: '**/output/*deb, **/coverage.xml'
75 signon-apparmor-extension:
76 daily_release: False
77 autolanding_template: False
78 use_stack_ppa: False
79+ hooks: H05set_package_version H10enable_coverage D10install_lcov B09qmakecoverage D09add_ppa~gcovr-team~ppa D10install_gcovr B10gcovr_run C09copy_results
80+ archive_artifacts: '**/coverage.xml'
81+ publish_coverage: '**/coverage.xml'
82+ configurations:
83+ utopic-armhf:
84+ archive_artifacts: '**/output/*deb, **/coverage.xml'
85 signon-keyring-extension:
86 daily_release: False
87 autolanding_template: False
88@@ -65,16 +93,29 @@
89 hooks: H05set_package_version H10enable_coverage D10install_lcov B09qmakecoverage D09add_ppa~gcovr-team~ppa D10install_gcovr B10gcovr_run C09copy_results
90 archive_artifacts: '**/coverage.xml'
91 publish_coverage: '**/coverage.xml'
92+ configurations:
93+ utopic-armhf:
94+ archive_artifacts: '**/output/*deb, **/coverage.xml'
95 signon-plugin-oauth2:
96 daily_release: False
97 autolanding_template: False
98 use_stack_ppa: False
99 hooks: H05set_package_version B09qmakecoverage D09add_ppa~gcovr-team~ppa D10install_gcovr B10gcovr_run H10enable_coverage H40native_hack.py D10install_lcov C09copy_results
100+ archive_artifacts: '**/coverage.xml'
101+ publish_coverage: '**/coverage.xml'
102+ configurations:
103+ utopic-armhf:
104+ archive_artifacts: '**/output/*deb, **/coverage.xml'
105 signon-ui:
106 daily_release: False
107 autolanding_template: False
108 use_stack_ppa: False
109 hooks: H05set_package_version H10enable_coverage D09add_ppa~gcovr-team~ppa D10install_gcovr D10install_lcov B09qmakecoverage C09copy_results
110+ archive_artifacts: '**/coverage.xml'
111+ publish_coverage: '**/coverage.xml'
112+ configurations:
113+ utopic-armhf:
114+ archive_artifacts: '**/output/*deb, **/coverage.xml'
115 ubuntuone-client-data:
116 daily_release: False
117 autolanding_template: False

Subscribers

People subscribed via source and target branches

to all changes: