cupstream2distro Configuration

Merge lp:~sil2100/cupstream2distro-config/hook_cleanups into lp:cupstream2distro-config

  1. hook_cleanups
  2. Merge into trunk
Proposed by Łukasz Zemczak
Status: Merged
Approved by: Francis Ginther
Approved revision: 742
Merged at revision: 738
Proposed branch: lp:~sil2100/cupstream2distro-config/hook_cleanups
Merge into: lp:cupstream2distro-config
Diff against target: 188 lines (+21/-24)
8 files modified
stacks/head/apps.cfg (+2/-2)
stacks/head/hud.cfg (+0/-1)
stacks/head/media.cfg (+6/-7)
stacks/head/mir.cfg (+1/-1)
stacks/head/mirslave.cfg (+1/-1)
stacks/head/phone.cfg (+1/-1)
stacks/head/platform.cfg (+1/-2)
stacks/head/webapp.cfg (+9/-9)
To merge this branch: bzr merge lp:~sil2100/cupstream2distro-config/hook_cleanups
Reviewer Review Type Date Requested Status
Francis Ginther Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+183686@code.launchpad.net

Commit message

Remove many many unneeded PPA addition hooks in the head stacks

Description of the change

Remove many many unneeded PPA addition hooks in the head stacks

There's still webcred.cfg to check, but I need Ken for that!

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

PASSED: Continuous integration, rev:741
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/491/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-saucy-amd64-ci/289

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

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

webapp.cfg needs a fix. The hook 'H05debian_rules_hack' should not be applied to:
webapps-applications
unity-firefox-extension
webapps-greasemonkey
unity-webapps-qml
cordova-ubuntu
cordova-ubuntu-tests

For these, please add 'hooks: False' to override the value in ci_default.

Otherwise, this is all good.

review: Needs Fixing
lp:~sil2100/cupstream2distro-config/hook_cleanups updated
742. By Łukasz Zemczak

Override the hooks: for some webapps components

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

PASSED: Continuous integration, rev:742
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/492/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-saucy-amd64-ci/290

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

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

Thanks for the update, looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stacks/head/apps.cfg'
2--- stacks/head/apps.cfg 2013-09-03 12:15:45 +0000
3+++ stacks/head/apps.cfg 2013-09-03 16:55:22 +0000
4@@ -39,7 +39,7 @@
5 aggregate_tests: generic-mediumtests-saucy
6 archive_artifacts: '**/*test*.xml'
7 publish_junit: '**/*test*.xml'
8- hooks: D09add_ppa~phablet-team~ppa A10checklicenseheaders D09add_ppa~ubuntu-sdk-team~ppa
9+ hooks: A10checklicenseheaders
10 projects:
11 gallery-app:
12 configurations:
13@@ -62,7 +62,7 @@
14 aggregate_tests: saucy-amd64 generic-mediumtests-saucy
15 archive_artifacts: '**/coverage.xml, **/*test*.xml'
16 publish_coverage: '**/coverage.xml'
17- hooks: D09add_ppa~phablet-team~ppa A10checklicenseheaders D09add_ppa~ubuntu-sdk-team~ppa D10install_lcov H10enable_coverage B10gcovr_run
18+ hooks: A10checklicenseheaders D10install_lcov H10enable_coverage B10gcovr_run
19 webbrowser-app:
20 test_suite: webbrowser_app
21 notes-app:
22
23=== modified file 'stacks/head/hud.cfg'
24--- stacks/head/hud.cfg 2013-09-03 12:15:45 +0000
25+++ stacks/head/hud.cfg 2013-09-03 16:55:22 +0000
26@@ -34,7 +34,6 @@
27 publish_coverage: '**/results/coverage.xml'
28 publish_junit: '**/results/test*.xml'
29 libhud-qt:
30- hooks: D09add_ppa~phablet-team~ppa
31 ci:
32 configurations:
33 saucy-armhf:
34
35=== modified file 'stacks/head/media.cfg'
36--- stacks/head/media.cfg 2013-09-03 12:15:45 +0000
37+++ stacks/head/media.cfg 2013-09-03 16:55:22 +0000
38@@ -34,7 +34,7 @@
39 projects:
40 camera-app:
41 contact_email: omer.akram@canonical.com
42- hooks: D09add_ppa~phablet-team~ppa A10checklicenseheaders D09add_ppa~ubuntu-sdk-team~ppa
43+ hooks: A10checklicenseheaders
44 test_suite: camera_app
45 configurations:
46 generic-mediumtests-saucy:
47@@ -46,7 +46,7 @@
48 publish_junit: '**/*test*.xml'
49 mediaplayer-app:
50 contact_email: omer.akram@canonical.com
51- hooks: D09add_ppa~phablet-team~ppa A10checklicenseheaders D09add_ppa~ubuntu-sdk-team~ppa
52+ hooks: A10checklicenseheaders
53 test_suite: mediaplayer_app
54 configurations:
55 generic-mediumtests-saucy:
56@@ -58,19 +58,18 @@
57 publish_junit: '**/*test*.xml'
58 mediascanner:
59 qtubuntu-camera:
60- hooks: D09add_ppa~phablet-team~ppa A10checklicenseheaders
61+ hooks: A10checklicenseheaders
62 qtubuntu-cameraplugin-fake:
63- hooks: D09add_ppa~mir-team~staging D09add_ppa~phablet-team~ppa A10checklicenseheaders
64+ hooks: A10checklicenseheaders
65 qtubuntu-media:
66- hooks: D09add_ppa~phablet-team~ppa B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov
67+ hooks: B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov
68 configurations:
69 saucy-armhf:
70 archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
71 publish_coverage: '**/coverage.xml'
72 qtubuntu-media-signals:
73- hooks: D09add_ppa~phablet-team~ppa
74 qtvideo-node:
75- hooks: D09add_ppa~phablet-team~ppa B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov
76+ hooks: B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov
77 configurations:
78 saucy-armhf:
79 archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
80
81=== modified file 'stacks/head/mir.cfg'
82--- stacks/head/mir.cfg 2013-09-03 12:15:45 +0000
83+++ stacks/head/mir.cfg 2013-09-03 16:55:22 +0000
84@@ -26,7 +26,7 @@
85 projects:
86 mir:
87 contact_email: thomi.richards@canonical.com francis.ginther@canonical.com
88- hooks: H05set_package_version D00mbs_archive H10enable_coverage B10gcovr_run H15enable_testing D10install_valgrind B09copy_results D09add_ppa~phablet-team~ppa
89+ hooks: H05set_package_version D00mbs_archive H10enable_coverage B10gcovr_run H15enable_testing D10install_valgrind B09copy_results
90 archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **/output/*deb'
91 publish_coverage: '**/results/coverage.xml'
92 publish_junit: '**/results/*test*.xml'
93
94=== modified file 'stacks/head/mirslave.cfg'
95--- stacks/head/mirslave.cfg 2013-09-03 12:15:45 +0000
96+++ stacks/head/mirslave.cfg 2013-09-03 16:55:22 +0000
97@@ -37,4 +37,4 @@
98 force-rebuild: True # force rebuild as Mir is changing ABI everyday
99 condition-force-rebuild: ../mir/mir.project* # rebuild everytime there is a Mir in the pipe
100 contact_email: thomi.richards@canonical.com francis.ginther@canonical.com
101- hooks: H05set_package_version D00mbs_archive D09add_ppa~mir-team~staging
102+ hooks: H05set_package_version D00mbs_archive
103
104=== modified file 'stacks/head/phone.cfg'
105--- stacks/head/phone.cfg 2013-08-30 09:11:25 +0000
106+++ stacks/head/phone.cfg 2013-09-03 16:55:22 +0000
107@@ -95,4 +95,4 @@
108 telephony-service:
109 autolanding: # indicator-messages is broken in archives
110 landing_job: phablet-land # indicator-messages is broken in archives
111- hooks: D09add_ppa~phablet-team~ppa B09googletests B10gcovr_run H10enable_coverage D10install_lcov A10checklicenseheaders # indicator-messages is broken in archives
112+ hooks: B09googletests B10gcovr_run H10enable_coverage D10install_lcov A10checklicenseheaders # indicator-messages is broken in archives
113
114=== modified file 'stacks/head/platform.cfg'
115--- stacks/head/platform.cfg 2013-09-03 12:15:45 +0000
116+++ stacks/head/platform.cfg 2013-09-03 16:55:22 +0000
117@@ -21,7 +21,6 @@
118 node_label: pbuilder
119 saucy-i386:
120 node_label: pbuilder
121- hooks: D09add_ppa~phablet-team~ppa
122 parallel_jobs: 2
123 use_description_for_commit: False
124 projects:
125@@ -47,7 +46,7 @@
126 saucy-i386: False
127 saucy-amd64: False
128 qtubuntu:
129- hooks: D09add_ppa~phablet-team~ppa A10checklicenseheaders
130+ hooks: A10checklicenseheaders
131 configurations:
132 saucy-i386: False
133 saucy-amd64: False
134
135=== modified file 'stacks/head/webapp.cfg'
136--- stacks/head/webapp.cfg 2013-08-30 04:09:55 +0000
137+++ stacks/head/webapp.cfg 2013-09-03 16:55:22 +0000
138@@ -22,11 +22,11 @@
139 saucy-armhf:
140 template: pbuilder-config.xml.tmpl
141 node_label: calxeda-pbuilder
142- hooks: D09add_ppa~webapps~staging H05debian_rules_hack
143+ hooks: H05debian_rules_hack
144 hook_source: lp:~fginther/+junk/webapp-hooks
145 projects:
146 webapps-applications:
147- hooks: D09add_ppa~webapps~staging
148+ hooks: False
149 unity-webapps-amazon:
150 unity-webapps-amazoncloudreader:
151 unity-webapps-bbcnews:
152@@ -63,29 +63,29 @@
153 unity-webapps-yandexnews:
154 unity-webapps-youtube:
155 libunity-webapps:
156- hooks: B10gcovr_run D10install_lcov H10enable_coverage D09add_ppa~webapps~staging
157+ hooks: B10gcovr_run D10install_lcov H10enable_coverage
158 archive_artifacts: '**/coverage.xml'
159 publish_coverage: '**/coverage.xml'
160 unity-chromium-extension:
161 daily_release: False # waiting for rvr to write some tests
162- hooks: B10gcovr_run D10install_lcov H10enable_coverage D09add_ppa~webapps~staging
163+ hooks: B10gcovr_run D10install_lcov H10enable_coverage
164 archive_artifacts: '**/*.xml'
165 publish_coverage: '**/coverage.xml'
166 unity-firefox-extension:
167 daily_release: False # waiting for rvr to write some tests
168- hooks: D09add_ppa~webapps~staging
169+ hooks: False
170 webapps-greasemonkey:
171 daily_release: False # waiting for rvr to write some tests
172- hooks: D09add_ppa~webapps~staging
173+ hooks: False
174 unity-webapps-qml:
175- hooks: D09add_ppa~webapps~staging
176+ hooks: False
177 cordova-ubuntu:
178- hooks: D08add_ppa-qt5-proper
179+ hooks: False
180 autolanding:
181 distributions: raring,saucy
182 ppa_target: ppa:ubuntu-sdk-team/ppa
183 cordova-ubuntu-tests:
184- hooks: D08add_ppa-qt5-proper
185+ hooks: False
186 autolanding:
187 distributions: raring,saucy
188 ppa_target: ppa:ubuntu-sdk-team/ppa

Subscribers

People subscribed via source and target branches

to all changes: