Merge lp:~sil2100/cupstream2distro-config/switch_unity_and_deps_to_saucy into lp:cupstream2distro-config
- switch_unity_and_deps_to_saucy
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Łukasz Zemczak |
Approved revision: | 374 |
Merged at revision: | 376 |
Proposed branch: | lp:~sil2100/cupstream2distro-config/switch_unity_and_deps_to_saucy |
Merge into: | lp:cupstream2distro-config |
Diff against target: |
553 lines (+92/-105) 14 files modified
stacks/head/apps.cfg (+15/-16) stacks/head/hud.cfg (+9/-10) stacks/head/indicators.cfg (+1/-1) stacks/head/location.cfg (+2/-3) stacks/head/media.cfg (+7/-8) stacks/head/misc.cfg (+6/-6) stacks/head/network.cfg (+2/-3) stacks/head/oif.cfg (+10/-11) stacks/head/phone.cfg (+5/-6) stacks/head/platform.cfg (+7/-8) stacks/head/qa.cfg (+2/-3) stacks/head/sdk.cfg (+5/-6) stacks/head/settings.cfg (+1/-2) stacks/head/unity.cfg (+20/-22) |
To merge this branch: | bzr merge lp:~sil2100/cupstream2distro-config/switch_unity_and_deps_to_saucy |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Sergio Schvezov | Approve | ||
Francis Ginther | Approve | ||
Mathieu Trudel-Lapierre | Needs Information | ||
Review via email: mp+167043@code.launchpad.net |
Commit message
Switch unity and all dependent stacks to saucy. Re-enable the indicator stack for daily releasing.
Description of the change
- Problem:
We've been releasing unity and some other stacks for raring up until now, but it's finally time to switch to saucy.
- Fix:
We're switching the unity stack and all dependencies (qa, hud, oif) to saucy. Besides that, larsu said it's ok to re-enable the indicator stack again, so we'll also have it in saucy as well.
- Tests:
N/A
Mathieu Trudel-Lapierre (cyphermox) wrote : | # |
Francis Ginther (fginther) wrote : | # |
The ci portions look good. Approve.
Łukasz Zemczak (sil2100) wrote : | # |
Please do not top-approve yet, as Sergio will do that once there is a green light from the touch guys on the transition.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:373
http://
Executed test runs:
SUCCESS: http://
Click here to trigger a rebuild:
http://
Francis Ginther (fginther) wrote : | # |
Upstream merge changes look good.
Sergio Schvezov (sergiusens) : | # |
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:374
http://
Executed test runs:
SUCCESS: http://
Click here to trigger a rebuild:
http://
Preview Diff
1 | === modified file 'stacks/head/apps.cfg' | |||
2 | --- stacks/head/apps.cfg 2013-05-29 07:50:01 +0000 | |||
3 | +++ stacks/head/apps.cfg 2013-06-03 16:26:46 +0000 | |||
4 | @@ -1,8 +1,7 @@ | |||
5 | 1 | stack: | 1 | stack: |
6 | 2 | name: apps | 2 | name: apps |
10 | 3 | series: raring | 3 | series: saucy |
11 | 4 | ppa: ubuntu-unity/daily-build-next | 4 | ppa: ubuntu-unity/daily-build |
9 | 5 | dest: ubuntu-unity/next | ||
12 | 6 | extracheck: ps-generic-autopilot-release-testing | 5 | extracheck: ps-generic-autopilot-release-testing |
13 | 7 | schedule: 0 5 * * 1-7 | 6 | schedule: 0 5 * * 1-7 |
14 | 8 | dependencies: | 7 | dependencies: |
15 | @@ -16,15 +15,15 @@ | |||
16 | 16 | ci_default: | 15 | ci_default: |
17 | 17 | use_description_for_commit: True | 16 | use_description_for_commit: True |
18 | 18 | configurations: | 17 | configurations: |
28 | 19 | raring-i386: | 18 | saucy-i386: |
29 | 20 | node_label: pbuilder | 19 | node_label: pbuilder |
30 | 21 | publish_junit: False | 20 | publish_junit: False |
31 | 22 | archive_artifacts: False | 21 | archive_artifacts: False |
32 | 23 | raring-amd64: | 22 | saucy-amd64: |
33 | 24 | node_label: pbuilder | 23 | node_label: pbuilder |
34 | 25 | publish_junit: False | 24 | publish_junit: False |
35 | 26 | archive_artifacts: False | 25 | archive_artifacts: False |
36 | 27 | raring-armhf: | 26 | saucy-armhf: |
37 | 28 | node_label: panda-pbuilder | 27 | node_label: panda-pbuilder |
38 | 29 | archive_artifacts: '**/output/*deb' | 28 | archive_artifacts: '**/output/*deb' |
39 | 30 | publish_junit: False | 29 | publish_junit: False |
40 | @@ -37,23 +36,23 @@ | |||
41 | 37 | projects: | 36 | projects: |
42 | 38 | gallery-app: | 37 | gallery-app: |
43 | 39 | configurations: | 38 | configurations: |
45 | 40 | raring-i386: | 39 | saucy-i386: |
46 | 41 | node_label: pbuilder | 40 | node_label: pbuilder |
47 | 42 | publish_junit: False | 41 | publish_junit: False |
48 | 43 | archive_artifacts: False | 42 | archive_artifacts: False |
49 | 44 | publish_coverage: False | 43 | publish_coverage: False |
51 | 45 | raring-amd64: | 44 | saucy-amd64: |
52 | 46 | node_label: pbuilder | 45 | node_label: pbuilder |
53 | 47 | publish_junit: False | 46 | publish_junit: False |
54 | 48 | archive_artifacts: '**/coverage.xml' | 47 | archive_artifacts: '**/coverage.xml' |
55 | 49 | publish_coverage: False | 48 | publish_coverage: False |
57 | 50 | raring-armhf: | 49 | saucy-armhf: |
58 | 51 | node_label: panda-pbuilder | 50 | node_label: panda-pbuilder |
59 | 52 | archive_artifacts: '**/output/*deb' | 51 | archive_artifacts: '**/output/*deb' |
60 | 53 | publish_junit: False | 52 | publish_junit: False |
61 | 54 | publish_coverage: False | 53 | publish_coverage: False |
62 | 55 | test_suite: gallery_app | 54 | test_suite: gallery_app |
64 | 56 | aggregate_tests: raring-amd64 generic-mediumtests | 55 | aggregate_tests: saucy-amd64 generic-mediumtests |
65 | 57 | archive_artifacts: '**/coverage.xml, **/*test*.xml' | 56 | archive_artifacts: '**/coverage.xml, **/*test*.xml' |
66 | 58 | publish_coverage: '**/coverage.xml' | 57 | publish_coverage: '**/coverage.xml' |
67 | 59 | hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper A10checklicenseheaders D09add_ppa-ubuntu-sdk-team-ppa D10install_lcov H10enable_coverage B10gcovr_run | 58 | hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper A10checklicenseheaders D09add_ppa-ubuntu-sdk-team-ppa D10install_lcov H10enable_coverage B10gcovr_run |
68 | 60 | 59 | ||
69 | === modified file 'stacks/head/hud.cfg' | |||
70 | --- stacks/head/hud.cfg 2013-05-29 07:50:01 +0000 | |||
71 | +++ stacks/head/hud.cfg 2013-06-03 16:26:46 +0000 | |||
72 | @@ -1,8 +1,7 @@ | |||
73 | 1 | stack: | 1 | stack: |
74 | 2 | name: hud | 2 | name: hud |
78 | 3 | series: raring | 3 | series: saucy |
79 | 4 | ppa: ubuntu-unity/daily-build-next | 4 | ppa: ubuntu-unity/daily-build |
77 | 5 | dest: ubuntu-unity/next | ||
80 | 6 | extracheck: ps-generic-autopilot-release-testing | 5 | extracheck: ps-generic-autopilot-release-testing |
81 | 7 | schedule: 0 3 * * 1-7 | 6 | schedule: 0 3 * * 1-7 |
82 | 8 | dependencies: | 7 | dependencies: |
83 | @@ -10,11 +9,11 @@ | |||
84 | 10 | - indicators | 9 | - indicators |
85 | 11 | ci_default: | 10 | ci_default: |
86 | 12 | configurations: | 11 | configurations: |
92 | 13 | raring-i386: | 12 | saucy-i386: |
93 | 14 | node_label: pbuilder | 13 | node_label: pbuilder |
94 | 15 | raring-amd64: | 14 | saucy-amd64: |
95 | 16 | node_label: pbuilder | 15 | node_label: pbuilder |
96 | 17 | raring-armhf: | 16 | saucy-armhf: |
97 | 18 | node_label: panda-pbuilder | 17 | node_label: panda-pbuilder |
98 | 19 | parallel_jobs: 2 | 18 | parallel_jobs: 2 |
99 | 20 | contact_email: allan.lesage@canonical.com | 19 | contact_email: allan.lesage@canonical.com |
100 | @@ -28,7 +27,7 @@ | |||
101 | 28 | hud: | 27 | hud: |
102 | 29 | hooks: D09add_ppa-private-ps-quality-team-staging B10gcovr_run H10enable_coverage D10install_lcov B09copy_results D10install_gtester2xunit | 28 | hooks: D09add_ppa-private-ps-quality-team-staging B10gcovr_run H10enable_coverage D10install_lcov B09copy_results D10install_gtester2xunit |
103 | 30 | configurations: | 29 | configurations: |
105 | 31 | raring-armhf: False | 30 | saucy-armhf: False |
106 | 32 | archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **results/**' | 31 | archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **results/**' |
107 | 33 | publish_coverage: '**/results/coverage.xml' | 32 | publish_coverage: '**/results/coverage.xml' |
108 | 34 | publish_junit: '**/results/test*.xml' | 33 | publish_junit: '**/results/test*.xml' |
109 | @@ -36,5 +35,5 @@ | |||
110 | 36 | hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper | 35 | hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper |
111 | 37 | ci: | 36 | ci: |
112 | 38 | configurations: | 37 | configurations: |
114 | 39 | raring-armhf: | 38 | saucy-armhf: |
115 | 40 | archive_artifacts: '**/output/*deb' | 39 | archive_artifacts: '**/output/*deb' |
116 | 41 | 40 | ||
117 | === modified file 'stacks/head/indicators.cfg' | |||
118 | --- stacks/head/indicators.cfg 2013-05-29 07:50:01 +0000 | |||
119 | +++ stacks/head/indicators.cfg 2013-06-03 16:26:46 +0000 | |||
120 | @@ -3,7 +3,7 @@ | |||
121 | 3 | series: saucy | 3 | series: saucy |
122 | 4 | ppa: ubuntu-unity/daily-build | 4 | ppa: ubuntu-unity/daily-build |
123 | 5 | extracheck: ps-generic-autopilot-release-testing | 5 | extracheck: ps-generic-autopilot-release-testing |
125 | 6 | #schedule: 0 2 * * 1-7 | 6 | schedule: 0 2 * * 1-7 |
126 | 7 | dependencies: | 7 | dependencies: |
127 | 8 | - qa | 8 | - qa |
128 | 9 | ci_default: | 9 | ci_default: |
129 | 10 | 10 | ||
130 | === modified file 'stacks/head/location.cfg' | |||
131 | --- stacks/head/location.cfg 2013-05-29 07:50:01 +0000 | |||
132 | +++ stacks/head/location.cfg 2013-06-03 16:26:46 +0000 | |||
133 | @@ -1,8 +1,7 @@ | |||
134 | 1 | stack: | 1 | stack: |
135 | 2 | name: location | 2 | name: location |
139 | 3 | series: raring | 3 | series: saucy |
140 | 4 | ppa: ubuntu-unity/daily-build-next | 4 | ppa: ubuntu-unity/daily-build |
138 | 5 | dest: ubuntu-unity/next | ||
141 | 6 | extracheck: ps-generic-autopilot-release-testing | 5 | extracheck: ps-generic-autopilot-release-testing |
142 | 7 | schedule: 0 4 * * 1-7 | 6 | schedule: 0 4 * * 1-7 |
143 | 8 | dependencies: | 7 | dependencies: |
144 | 9 | 8 | ||
145 | === modified file 'stacks/head/media.cfg' | |||
146 | --- stacks/head/media.cfg 2013-05-29 07:50:01 +0000 | |||
147 | +++ stacks/head/media.cfg 2013-06-03 16:26:46 +0000 | |||
148 | @@ -1,8 +1,7 @@ | |||
149 | 1 | stack: | 1 | stack: |
150 | 2 | name: media | 2 | name: media |
154 | 3 | series: raring | 3 | series: saucy |
155 | 4 | ppa: ubuntu-unity/daily-build-next | 4 | ppa: ubuntu-unity/daily-build |
153 | 5 | dest: ubuntu-unity/next | ||
156 | 6 | extracheck: ps-generic-autopilot-release-testing | 5 | extracheck: ps-generic-autopilot-release-testing |
157 | 7 | schedule: 0 4 * * 1-7 | 6 | schedule: 0 4 * * 1-7 |
158 | 8 | dependencies: | 7 | dependencies: |
159 | @@ -16,15 +15,15 @@ | |||
160 | 16 | tests: camera_app mediaplayer_app | 15 | tests: camera_app mediaplayer_app |
161 | 17 | ci_default: | 16 | ci_default: |
162 | 18 | configurations: | 17 | configurations: |
164 | 19 | raring-armhf: | 18 | saucy-armhf: |
165 | 20 | node_label: panda-pbuilder | 19 | node_label: panda-pbuilder |
166 | 21 | archive_artifacts: '**/output/*deb' | 20 | archive_artifacts: '**/output/*deb' |
167 | 22 | publish_junit: False | 21 | publish_junit: False |
169 | 23 | raring-amd64: | 22 | saucy-amd64: |
170 | 24 | node_label: pbuilder | 23 | node_label: pbuilder |
171 | 25 | archive_artifacts: False | 24 | archive_artifacts: False |
172 | 26 | publish_junit: False | 25 | publish_junit: False |
174 | 27 | raring-i386: | 26 | saucy-i386: |
175 | 28 | node_label: pbuilder | 27 | node_label: pbuilder |
176 | 29 | archive_artifacts: False | 28 | archive_artifacts: False |
177 | 30 | publish_junit: False | 29 | publish_junit: False |
178 | @@ -57,7 +56,7 @@ | |||
179 | 57 | qtubuntu-media: | 56 | qtubuntu-media: |
180 | 58 | hooks: D08add_ppa-qt5-proper D09add_ppa-phablet-team-ppa B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov | 57 | hooks: D08add_ppa-qt5-proper D09add_ppa-phablet-team-ppa B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov |
181 | 59 | configurations: | 58 | configurations: |
183 | 60 | raring-armhf: | 59 | saucy-armhf: |
184 | 61 | archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml' | 60 | archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml' |
185 | 62 | publish_coverage: '**/coverage.xml' | 61 | publish_coverage: '**/coverage.xml' |
186 | 63 | qtubuntu-media-signals: | 62 | qtubuntu-media-signals: |
187 | @@ -65,6 +64,6 @@ | |||
188 | 65 | qtvideo-node: | 64 | qtvideo-node: |
189 | 66 | hooks: D08add_ppa-qt5-proper D09add_ppa-phablet-team-ppa B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov | 65 | hooks: D08add_ppa-qt5-proper D09add_ppa-phablet-team-ppa B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov |
190 | 67 | configurations: | 66 | configurations: |
192 | 68 | raring-armhf: | 67 | saucy-armhf: |
193 | 69 | archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml' | 68 | archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml' |
194 | 70 | publish_coverage: '**/results/coverage.xml' | 69 | publish_coverage: '**/results/coverage.xml' |
195 | 71 | 70 | ||
196 | === modified file 'stacks/head/misc.cfg' | |||
197 | --- stacks/head/misc.cfg 2013-05-29 18:40:37 +0000 | |||
198 | +++ stacks/head/misc.cfg 2013-06-03 16:26:46 +0000 | |||
199 | @@ -7,16 +7,16 @@ | |||
200 | 7 | ci_default: | 7 | ci_default: |
201 | 8 | contact_email: allan.lesage@canonical.com | 8 | contact_email: allan.lesage@canonical.com |
202 | 9 | configurations: | 9 | configurations: |
208 | 10 | raring-amd64: | 10 | saucy-amd64: |
209 | 11 | node_label: pbuilder | 11 | node_label: pbuilder |
210 | 12 | raring-i386: | 12 | saucy-i386: |
211 | 13 | node_label: pbuilder | 13 | node_label: pbuilder |
212 | 14 | raring-armhf: | 14 | saucy-armhf: |
213 | 15 | node_label: panda-pbuilder | 15 | node_label: panda-pbuilder |
214 | 16 | projects: | 16 | projects: |
215 | 17 | android-audiosystem: | 17 | android-audiosystem: |
216 | 18 | configurations: | 18 | configurations: |
218 | 19 | raring-i386: False | 19 | saucy-i386: False |
219 | 20 | gnome-control-center-unity: | 20 | gnome-control-center-unity: |
220 | 21 | contact_email: francis.ginther@canonical.com | 21 | contact_email: francis.ginther@canonical.com |
221 | 22 | notify-osd: | 22 | notify-osd: |
222 | 23 | 23 | ||
223 | === modified file 'stacks/head/network.cfg' | |||
224 | --- stacks/head/network.cfg 2013-05-29 07:50:01 +0000 | |||
225 | +++ stacks/head/network.cfg 2013-06-03 16:26:46 +0000 | |||
226 | @@ -1,8 +1,7 @@ | |||
227 | 1 | stack: | 1 | stack: |
228 | 2 | name: network | 2 | name: network |
232 | 3 | series: raring | 3 | series: saucy |
233 | 4 | ppa: ubuntu-unity/daily-build-next | 4 | ppa: ubuntu-unity/daily-build |
231 | 5 | dest: ubuntu-unity/next | ||
234 | 6 | extracheck: ps-generic-autopilot-release-testing | 5 | extracheck: ps-generic-autopilot-release-testing |
235 | 7 | schedule: 0 1 * * 1-7 | 6 | schedule: 0 1 * * 1-7 |
236 | 8 | dependencies: | 7 | dependencies: |
237 | 9 | 8 | ||
238 | === modified file 'stacks/head/oif.cfg' | |||
239 | --- stacks/head/oif.cfg 2013-05-29 14:09:21 +0000 | |||
240 | +++ stacks/head/oif.cfg 2013-06-03 16:26:46 +0000 | |||
241 | @@ -1,8 +1,7 @@ | |||
242 | 1 | stack: | 1 | stack: |
243 | 2 | name: oif | 2 | name: oif |
247 | 3 | series: raring | 3 | series: saucy |
248 | 4 | ppa: ubuntu-unity/daily-build-next | 4 | ppa: ubuntu-unity/daily-build |
246 | 5 | dest: ubuntu-unity/next | ||
249 | 6 | extracheck: ps-generic-autopilot-release-testing | 5 | extracheck: ps-generic-autopilot-release-testing |
250 | 7 | schedule: 0 2 * * 1-7 | 6 | schedule: 0 2 * * 1-7 |
251 | 8 | ci_default: | 7 | ci_default: |
252 | @@ -13,13 +12,13 @@ | |||
253 | 13 | hooks: H05set_package_version D00mbs_archive | 12 | hooks: H05set_package_version D00mbs_archive |
254 | 14 | hook_source: lp:~private-ps-quality-team/+junk/mbs-archive-hooks | 13 | hook_source: lp:~private-ps-quality-team/+junk/mbs-archive-hooks |
255 | 15 | configurations: | 14 | configurations: |
263 | 16 | raring-amd64: | 15 | saucy-amd64: |
264 | 17 | template: mbs-pbuilder-config.xml.tmpl | 16 | template: mbs-pbuilder-config.xml.tmpl |
265 | 18 | node_label: pbuilder | 17 | node_label: pbuilder |
266 | 19 | raring-i386: | 18 | saucy-i386: |
267 | 20 | template: mbs-pbuilder-config.xml.tmpl | 19 | template: mbs-pbuilder-config.xml.tmpl |
268 | 21 | node_label: pbuilder | 20 | node_label: pbuilder |
269 | 22 | raring-armhf: | 21 | saucy-armhf: |
270 | 23 | template: mbs-pbuilder-config.xml.tmpl | 22 | template: mbs-pbuilder-config.xml.tmpl |
271 | 24 | node_label: panda-pbuilder | 23 | node_label: panda-pbuilder |
272 | 25 | publish_coverage: False | 24 | publish_coverage: False |
273 | @@ -28,7 +27,7 @@ | |||
274 | 28 | local_archive_tmp: /home/ubuntu/local-archive | 27 | local_archive_tmp: /home/ubuntu/local-archive |
275 | 29 | local_archive_name: head.oif | 28 | local_archive_name: head.oif |
276 | 30 | local_archive_source: http://naartjie/archive/ | 29 | local_archive_source: http://naartjie/archive/ |
278 | 31 | local_archive_pocket: raring | 30 | local_archive_pocket: saucy |
279 | 32 | dependencies: | 31 | dependencies: |
280 | 33 | - qa | 32 | - qa |
281 | 34 | test_parameters: | 33 | test_parameters: |
282 | 35 | 34 | ||
283 | === modified file 'stacks/head/phone.cfg' | |||
284 | --- stacks/head/phone.cfg 2013-05-29 07:50:01 +0000 | |||
285 | +++ stacks/head/phone.cfg 2013-06-03 16:26:46 +0000 | |||
286 | @@ -1,8 +1,7 @@ | |||
287 | 1 | stack: | 1 | stack: |
288 | 2 | name: phone | 2 | name: phone |
292 | 3 | series: raring | 3 | series: saucy |
293 | 4 | ppa: ubuntu-unity/daily-build-next | 4 | ppa: ubuntu-unity/daily-build |
291 | 5 | dest: ubuntu-unity/next | ||
294 | 6 | extracheck: False #ps-generic-autopilot-release-testing | 5 | extracheck: False #ps-generic-autopilot-release-testing |
295 | 7 | schedule: 0 7 * * 1-7 | 6 | schedule: 0 7 * * 1-7 |
296 | 8 | dependencies: | 7 | dependencies: |
297 | @@ -17,15 +16,15 @@ | |||
298 | 17 | tests: phone_app | 16 | tests: phone_app |
299 | 18 | ci_default: | 17 | ci_default: |
300 | 19 | configurations: | 18 | configurations: |
302 | 20 | raring-armhf: | 19 | saucy-armhf: |
303 | 21 | node_label: panda-pbuilder | 20 | node_label: panda-pbuilder |
304 | 22 | archive_artifacts: '**/output/*deb, **/*test*.xml, **/coverage.xml' | 21 | archive_artifacts: '**/output/*deb, **/*test*.xml, **/coverage.xml' |
305 | 23 | publish_coverage: '**/coverage.xml' | 22 | publish_coverage: '**/coverage.xml' |
307 | 24 | raring-amd64: | 23 | saucy-amd64: |
308 | 25 | node_label: pbuilder | 24 | node_label: pbuilder |
309 | 26 | archive_artifacts: '**/*test*.xml, **/coverage.xml' | 25 | archive_artifacts: '**/*test*.xml, **/coverage.xml' |
310 | 27 | publish_coverage: '**/coverage.xml' | 26 | publish_coverage: '**/coverage.xml' |
312 | 28 | raring-i386: | 27 | saucy-i386: |
313 | 29 | node_label: pbuilder | 28 | node_label: pbuilder |
314 | 30 | archive_artifacts: '**/*test*.xml, **/coverage.xml' | 29 | archive_artifacts: '**/*test*.xml, **/coverage.xml' |
315 | 31 | publish_coverage: '**/coverage.xml' | 30 | publish_coverage: '**/coverage.xml' |
316 | 32 | 31 | ||
317 | === modified file 'stacks/head/platform.cfg' | |||
318 | --- stacks/head/platform.cfg 2013-05-29 12:14:59 +0000 | |||
319 | +++ stacks/head/platform.cfg 2013-06-03 16:26:46 +0000 | |||
320 | @@ -1,20 +1,19 @@ | |||
321 | 1 | stack: | 1 | stack: |
322 | 2 | name: platform | 2 | name: platform |
326 | 3 | series: raring | 3 | series: saucy |
327 | 4 | ppa: ubuntu-unity/daily-build-next | 4 | ppa: ubuntu-unity/daily-build |
325 | 5 | dest: ubuntu-unity/next | ||
328 | 6 | extracheck: False # Set to True to enable additional check step | 5 | extracheck: False # Set to True to enable additional check step |
329 | 7 | schedule: 0 2 * * 1-7 | 6 | schedule: 0 2 * * 1-7 |
330 | 8 | dependencies: | 7 | dependencies: |
331 | 9 | - qa | 8 | - qa |
332 | 10 | ci_default: | 9 | ci_default: |
333 | 11 | configurations: | 10 | configurations: |
335 | 12 | raring-armhf: | 11 | saucy-armhf: |
336 | 13 | node_label: panda-pbuilder | 12 | node_label: panda-pbuilder |
337 | 14 | archive_artifacts: '**/output/*deb' | 13 | archive_artifacts: '**/output/*deb' |
339 | 15 | raring-amd64: | 14 | saucy-amd64: |
340 | 16 | node_label: pbuilder | 15 | node_label: pbuilder |
342 | 17 | raring-i386: | 16 | saucy-i386: |
343 | 18 | node_label: pbuilder | 17 | node_label: pbuilder |
344 | 19 | hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper | 18 | hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper |
345 | 20 | parallel_jobs: 2 | 19 | parallel_jobs: 2 |
346 | @@ -25,8 +24,8 @@ | |||
347 | 25 | qtubuntu: | 24 | qtubuntu: |
348 | 26 | hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper A10checklicenseheaders | 25 | hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper A10checklicenseheaders |
349 | 27 | configurations: | 26 | configurations: |
352 | 28 | raring-i386: False | 27 | saucy-i386: False |
353 | 29 | raring-amd64: False | 28 | saucy-amd64: False |
354 | 30 | qtubuntu-sensors: | 29 | qtubuntu-sensors: |
355 | 31 | dbus-cpp: | 30 | dbus-cpp: |
356 | 32 | contact_email: thomas.voss@canonical.com | 31 | contact_email: thomas.voss@canonical.com |
357 | 33 | 32 | ||
358 | === modified file 'stacks/head/qa.cfg' | |||
359 | --- stacks/head/qa.cfg 2013-05-29 07:50:01 +0000 | |||
360 | +++ stacks/head/qa.cfg 2013-06-03 16:26:46 +0000 | |||
361 | @@ -1,8 +1,7 @@ | |||
362 | 1 | stack: | 1 | stack: |
363 | 2 | name: qa | 2 | name: qa |
367 | 3 | series: raring | 3 | series: saucy |
368 | 4 | ppa: ubuntu-unity/daily-build-next | 4 | ppa: ubuntu-unity/daily-build |
366 | 5 | dest: ubuntu-unity/next | ||
369 | 6 | extracheck: ps-generic-autopilot-release-testing | 5 | extracheck: ps-generic-autopilot-release-testing |
370 | 7 | schedule: 0 0 * * 1-7 | 6 | schedule: 0 0 * * 1-7 |
371 | 8 | test_parameters: | 7 | test_parameters: |
372 | 9 | 8 | ||
373 | === modified file 'stacks/head/sdk.cfg' | |||
374 | --- stacks/head/sdk.cfg 2013-05-29 07:50:01 +0000 | |||
375 | +++ stacks/head/sdk.cfg 2013-06-03 16:26:46 +0000 | |||
376 | @@ -1,8 +1,7 @@ | |||
377 | 1 | stack: | 1 | stack: |
378 | 2 | name: sdk | 2 | name: sdk |
382 | 3 | series: raring | 3 | series: saucy |
383 | 4 | ppa: ubuntu-unity/daily-build-next | 4 | ppa: ubuntu-unity/daily-build |
381 | 5 | dest: ubuntu-unity/next | ||
384 | 6 | extracheck: ps-generic-autopilot-release-testing | 5 | extracheck: ps-generic-autopilot-release-testing |
385 | 7 | schedule: 0 4 * * 1-7 | 6 | schedule: 0 4 * * 1-7 |
386 | 8 | dependencies: | 7 | dependencies: |
387 | @@ -11,11 +10,11 @@ | |||
388 | 11 | ci_default: | 10 | ci_default: |
389 | 12 | contact_email: juhapekka.piiroinen@canonical.com | 11 | contact_email: juhapekka.piiroinen@canonical.com |
390 | 13 | configurations: | 12 | configurations: |
392 | 14 | raring-amd64: | 13 | saucy-amd64: |
393 | 15 | template: pbuilder-config.xml.tmpl | 14 | template: pbuilder-config.xml.tmpl |
394 | 16 | node_label: pbuilder | 15 | node_label: pbuilder |
395 | 17 | irc_notification: False | 16 | irc_notification: False |
397 | 18 | raring-armhf: | 17 | saucy-armhf: |
398 | 19 | template: pbuilder-config.xml.tmpl | 18 | template: pbuilder-config.xml.tmpl |
399 | 20 | node_label: panda-pbuilder | 19 | node_label: panda-pbuilder |
400 | 21 | irc_notification: False | 20 | irc_notification: False |
401 | @@ -36,7 +35,7 @@ | |||
402 | 36 | publish_coverage: '**/results/coverage.xml' | 35 | publish_coverage: '**/results/coverage.xml' |
403 | 37 | publish_junit: '**/results/*test*.xml' | 36 | publish_junit: '**/results/*test*.xml' |
404 | 38 | configurations: | 37 | configurations: |
406 | 39 | raring-armhf: | 38 | saucy-armhf: |
407 | 40 | archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **/output/*deb' | 39 | archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **/output/*deb' |
408 | 41 | autolanding: | 40 | autolanding: |
409 | 42 | distributions: precise,quantal,raring,saucy | 41 | distributions: precise,quantal,raring,saucy |
410 | 43 | 42 | ||
411 | === modified file 'stacks/head/settings.cfg' | |||
412 | --- stacks/head/settings.cfg 2013-05-30 15:42:55 +0000 | |||
413 | +++ stacks/head/settings.cfg 2013-06-03 16:26:46 +0000 | |||
414 | @@ -1,8 +1,7 @@ | |||
415 | 1 | stack: | 1 | stack: |
416 | 2 | name: settings | 2 | name: settings |
417 | 3 | series: saucy | 3 | series: saucy |
420 | 4 | ppa: ubuntu-unity/daily-build-next | 4 | ppa: ubuntu-unity/daily-build |
419 | 5 | dest: ubuntu-unity/next | ||
421 | 6 | extracheck: False # Set to True to enable additional check step | 5 | extracheck: False # Set to True to enable additional check step |
422 | 7 | schedule: 0 7 * * 1-7 | 6 | schedule: 0 7 * * 1-7 |
423 | 8 | ci_default: | 7 | ci_default: |
424 | 9 | 8 | ||
425 | === modified file 'stacks/head/unity.cfg' | |||
426 | --- stacks/head/unity.cfg 2013-05-29 14:09:21 +0000 | |||
427 | +++ stacks/head/unity.cfg 2013-06-03 16:26:46 +0000 | |||
428 | @@ -1,8 +1,7 @@ | |||
429 | 1 | stack: | 1 | stack: |
430 | 2 | name: unity | 2 | name: unity |
434 | 3 | series: raring | 3 | series: saucy |
435 | 4 | ppa: ubuntu-unity/daily-build-next | 4 | ppa: ubuntu-unity/daily-build |
433 | 5 | dest: ubuntu-unity/next | ||
436 | 6 | extracheck: ps-generic-autopilot-release-testing | 5 | extracheck: ps-generic-autopilot-release-testing |
437 | 7 | schedule: 0 4 * * 1-7 | 6 | schedule: 0 4 * * 1-7 |
438 | 8 | ci_default: | 7 | ci_default: |
439 | @@ -13,13 +12,13 @@ | |||
440 | 13 | hooks: H05set_package_version D00mbs_archive | 12 | hooks: H05set_package_version D00mbs_archive |
441 | 14 | hook_source: lp:~private-ps-quality-team/+junk/unity-hooks | 13 | hook_source: lp:~private-ps-quality-team/+junk/unity-hooks |
442 | 15 | configurations: | 14 | configurations: |
450 | 16 | raring-amd64: | 15 | saucy-amd64: |
451 | 17 | template: mbs-pbuilder-config.xml.tmpl | 16 | template: mbs-pbuilder-config.xml.tmpl |
452 | 18 | node_label: pbuilder | 17 | node_label: pbuilder |
453 | 19 | raring-i386: | 18 | saucy-i386: |
454 | 20 | template: mbs-pbuilder-config.xml.tmpl | 19 | template: mbs-pbuilder-config.xml.tmpl |
455 | 21 | node_label: pbuilder | 20 | node_label: pbuilder |
456 | 22 | raring-armhf: | 21 | saucy-armhf: |
457 | 23 | template: mbs-pbuilder-config.xml.tmpl | 22 | template: mbs-pbuilder-config.xml.tmpl |
458 | 24 | node_label: panda-pbuilder | 23 | node_label: panda-pbuilder |
459 | 25 | publish_coverage: False | 24 | publish_coverage: False |
460 | @@ -28,13 +27,12 @@ | |||
461 | 28 | local_archive_login: ubuntu | 27 | local_archive_login: ubuntu |
462 | 29 | local_archive_tmp: /home/ubuntu/local-archive | 28 | local_archive_tmp: /home/ubuntu/local-archive |
463 | 30 | local_archive_source: http://naartjie/archive/ | 29 | local_archive_source: http://naartjie/archive/ |
465 | 31 | local_archive_pocket: raring | 30 | local_archive_pocket: saucy |
466 | 32 | test_parameters: | 31 | test_parameters: |
467 | 33 | testpackages: unity-autopilot | 32 | testpackages: unity-autopilot |
468 | 34 | tests: unity | 33 | tests: unity |
469 | 35 | dependencies: | 34 | dependencies: |
472 | 36 | - name: indicators | 35 | - indicators |
471 | 37 | release: raring | ||
473 | 38 | - oif | 36 | - oif |
474 | 39 | - webapp | 37 | - webapp |
475 | 40 | - webcred | 38 | - webcred |
476 | @@ -47,7 +45,7 @@ | |||
477 | 47 | publish_coverage: '**/results/coverage.xml' | 45 | publish_coverage: '**/results/coverage.xml' |
478 | 48 | publish_junit: '**/results/*test*xml' | 46 | publish_junit: '**/results/*test*xml' |
479 | 49 | configurations: | 47 | configurations: |
481 | 50 | raring-armhf: | 48 | saucy-armhf: |
482 | 51 | hooks: H05set_package_version D00mbs_archive D10specifictests B05xsltproc B09copy_results | 49 | hooks: H05set_package_version D00mbs_archive D10specifictests B05xsltproc B09copy_results |
483 | 52 | compiz: | 50 | compiz: |
484 | 53 | daily_release: False # remember we don't want to land compiz trunk before activating this one | 51 | daily_release: False # remember we don't want to land compiz trunk before activating this one |
485 | @@ -59,14 +57,14 @@ | |||
486 | 59 | autolanding: | 57 | autolanding: |
487 | 60 | hooks: H05set_package_version D00mbs_archive B09googletests_cmake H15enable_testing D10install_google_test H10enable_coverage B10gcovr_run D10install_lcov | 58 | hooks: H05set_package_version D00mbs_archive B09googletests_cmake H15enable_testing D10install_google_test H10enable_coverage B10gcovr_run D10install_lcov |
488 | 61 | configurations: | 59 | configurations: |
490 | 62 | raring-armhf: | 60 | saucy-armhf: |
491 | 63 | hooks: H05set_package_version D00mbs_archive B09googletests_cmake H15enable_testing D10install_google_test | 61 | hooks: H05set_package_version D00mbs_archive B09googletests_cmake H15enable_testing D10install_google_test |
492 | 64 | ci: | 62 | ci: |
493 | 65 | hooks: D00mbs_archive H15enable_testing D10install_google_test H10enable_coverage B10gcovr_run D10install_lcov B09googletests_cmake | 63 | hooks: D00mbs_archive H15enable_testing D10install_google_test H10enable_coverage B10gcovr_run D10install_lcov B09googletests_cmake |
494 | 66 | configurations: | 64 | configurations: |
495 | 67 | compiz-gles-ci: | 65 | compiz-gles-ci: |
496 | 68 | template: False | 66 | template: False |
498 | 69 | raring-armhf: | 67 | saucy-armhf: |
499 | 70 | hooks: D00mbs_archive H15enable_testing D10install_google_test B09googletests_cmake D10install_valgrind | 68 | hooks: D00mbs_archive H15enable_testing D10install_google_test B09googletests_cmake D10install_valgrind |
500 | 71 | libunity: | 69 | libunity: |
501 | 72 | libunity-misc: | 70 | libunity-misc: |
502 | @@ -77,7 +75,7 @@ | |||
503 | 77 | publish_junit: '**/results/*test*xml' | 75 | publish_junit: '**/results/*test*xml' |
504 | 78 | rebuild: unity | 76 | rebuild: unity |
505 | 79 | configurations: | 77 | configurations: |
507 | 80 | raring-armhf: | 78 | saucy-armhf: |
508 | 81 | hooks: H05set_package_version D00mbs_archive B09googletests B09copy_results D10specifictests | 79 | hooks: H05set_package_version D00mbs_archive B09googletests B09copy_results D10specifictests |
509 | 82 | unity: | 80 | unity: |
510 | 83 | build_timeout: 240 | 81 | build_timeout: 240 |
511 | @@ -86,13 +84,13 @@ | |||
512 | 86 | publish_coverage: '**/results/coverage.xml' | 84 | publish_coverage: '**/results/coverage.xml' |
513 | 87 | publish_junit: '**/results/*test*xml' | 85 | publish_junit: '**/results/*test*xml' |
514 | 88 | configurations: | 86 | configurations: |
516 | 89 | raring-armhf: | 87 | saucy-armhf: |
517 | 90 | hooks: H05set_package_version D00mbs_archive D10install_google_test B09googletests B09copy_results | 88 | hooks: H05set_package_version D00mbs_archive D10install_google_test B09googletests B09copy_results |
518 | 91 | unity-asset-pool: | 89 | unity-asset-pool: |
519 | 92 | unity-lens-applications: | 90 | unity-lens-applications: |
520 | 93 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov | 91 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov |
521 | 94 | configurations: | 92 | configurations: |
523 | 95 | raring-armhf: | 93 | saucy-armhf: |
524 | 96 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results | 94 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results |
525 | 97 | archive_artifacts: False | 95 | archive_artifacts: False |
526 | 98 | archive_artifacts: '**/results/**' | 96 | archive_artifacts: '**/results/**' |
527 | @@ -102,7 +100,7 @@ | |||
528 | 102 | unity-lens-music: | 100 | unity-lens-music: |
529 | 103 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov | 101 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov |
530 | 104 | configurations: | 102 | configurations: |
532 | 105 | raring-armhf: | 103 | saucy-armhf: |
533 | 106 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results | 104 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results |
534 | 107 | archive_artifacts: False | 105 | archive_artifacts: False |
535 | 108 | archive_artifacts: '**/results/**' | 106 | archive_artifacts: '**/results/**' |
536 | @@ -111,7 +109,7 @@ | |||
537 | 111 | unity-lens-shopping: | 109 | unity-lens-shopping: |
538 | 112 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov | 110 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov |
539 | 113 | configurations: | 111 | configurations: |
541 | 114 | raring-armhf: | 112 | saucy-armhf: |
542 | 115 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results | 113 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results |
543 | 116 | archive_artifacts: False | 114 | archive_artifacts: False |
544 | 117 | archive_artifacts: '**/results/**' | 115 | archive_artifacts: '**/results/**' |
545 | @@ -119,7 +117,7 @@ | |||
546 | 119 | unity-lens-video: | 117 | unity-lens-video: |
547 | 120 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov | 118 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov |
548 | 121 | configurations: | 119 | configurations: |
550 | 122 | raring-armhf: | 120 | saucy-armhf: |
551 | 123 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results | 121 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results |
552 | 124 | archive_artifacts: False | 122 | archive_artifacts: False |
553 | 125 | archive_artifacts: '**/results/**' | 123 | archive_artifacts: '**/results/**' |
If we're good with -CI on saucy (so 'configurations' stanzas, and 'local_ archive_ pocket' for OIF) then I'd say it's good to merge.