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 | stack: |
6 | name: apps |
7 | - series: raring |
8 | - ppa: ubuntu-unity/daily-build-next |
9 | - dest: ubuntu-unity/next |
10 | + series: saucy |
11 | + ppa: ubuntu-unity/daily-build |
12 | extracheck: ps-generic-autopilot-release-testing |
13 | schedule: 0 5 * * 1-7 |
14 | dependencies: |
15 | @@ -16,15 +15,15 @@ |
16 | ci_default: |
17 | use_description_for_commit: True |
18 | configurations: |
19 | - raring-i386: |
20 | - node_label: pbuilder |
21 | - publish_junit: False |
22 | - archive_artifacts: False |
23 | - raring-amd64: |
24 | - node_label: pbuilder |
25 | - publish_junit: False |
26 | - archive_artifacts: False |
27 | - raring-armhf: |
28 | + saucy-i386: |
29 | + node_label: pbuilder |
30 | + publish_junit: False |
31 | + archive_artifacts: False |
32 | + saucy-amd64: |
33 | + node_label: pbuilder |
34 | + publish_junit: False |
35 | + archive_artifacts: False |
36 | + saucy-armhf: |
37 | node_label: panda-pbuilder |
38 | archive_artifacts: '**/output/*deb' |
39 | publish_junit: False |
40 | @@ -37,23 +36,23 @@ |
41 | projects: |
42 | gallery-app: |
43 | configurations: |
44 | - raring-i386: |
45 | + saucy-i386: |
46 | node_label: pbuilder |
47 | publish_junit: False |
48 | archive_artifacts: False |
49 | publish_coverage: False |
50 | - raring-amd64: |
51 | + saucy-amd64: |
52 | node_label: pbuilder |
53 | publish_junit: False |
54 | archive_artifacts: '**/coverage.xml' |
55 | publish_coverage: False |
56 | - raring-armhf: |
57 | + saucy-armhf: |
58 | node_label: panda-pbuilder |
59 | archive_artifacts: '**/output/*deb' |
60 | publish_junit: False |
61 | publish_coverage: False |
62 | test_suite: gallery_app |
63 | - aggregate_tests: raring-amd64 generic-mediumtests |
64 | + aggregate_tests: saucy-amd64 generic-mediumtests |
65 | archive_artifacts: '**/coverage.xml, **/*test*.xml' |
66 | publish_coverage: '**/coverage.xml' |
67 | hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper A10checklicenseheaders D09add_ppa-ubuntu-sdk-team-ppa D10install_lcov H10enable_coverage B10gcovr_run |
68 | |
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 | stack: |
74 | name: hud |
75 | - series: raring |
76 | - ppa: ubuntu-unity/daily-build-next |
77 | - dest: ubuntu-unity/next |
78 | + series: saucy |
79 | + ppa: ubuntu-unity/daily-build |
80 | extracheck: ps-generic-autopilot-release-testing |
81 | schedule: 0 3 * * 1-7 |
82 | dependencies: |
83 | @@ -10,11 +9,11 @@ |
84 | - indicators |
85 | ci_default: |
86 | configurations: |
87 | - raring-i386: |
88 | - node_label: pbuilder |
89 | - raring-amd64: |
90 | - node_label: pbuilder |
91 | - raring-armhf: |
92 | + saucy-i386: |
93 | + node_label: pbuilder |
94 | + saucy-amd64: |
95 | + node_label: pbuilder |
96 | + saucy-armhf: |
97 | node_label: panda-pbuilder |
98 | parallel_jobs: 2 |
99 | contact_email: allan.lesage@canonical.com |
100 | @@ -28,7 +27,7 @@ |
101 | hud: |
102 | hooks: D09add_ppa-private-ps-quality-team-staging B10gcovr_run H10enable_coverage D10install_lcov B09copy_results D10install_gtester2xunit |
103 | configurations: |
104 | - raring-armhf: False |
105 | + saucy-armhf: False |
106 | archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **results/**' |
107 | publish_coverage: '**/results/coverage.xml' |
108 | publish_junit: '**/results/test*.xml' |
109 | @@ -36,5 +35,5 @@ |
110 | hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper |
111 | ci: |
112 | configurations: |
113 | - raring-armhf: |
114 | + saucy-armhf: |
115 | archive_artifacts: '**/output/*deb' |
116 | |
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 | series: saucy |
122 | ppa: ubuntu-unity/daily-build |
123 | extracheck: ps-generic-autopilot-release-testing |
124 | - #schedule: 0 2 * * 1-7 |
125 | + schedule: 0 2 * * 1-7 |
126 | dependencies: |
127 | - qa |
128 | ci_default: |
129 | |
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 | stack: |
135 | name: location |
136 | - series: raring |
137 | - ppa: ubuntu-unity/daily-build-next |
138 | - dest: ubuntu-unity/next |
139 | + series: saucy |
140 | + ppa: ubuntu-unity/daily-build |
141 | extracheck: ps-generic-autopilot-release-testing |
142 | schedule: 0 4 * * 1-7 |
143 | dependencies: |
144 | |
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 | stack: |
150 | name: media |
151 | - series: raring |
152 | - ppa: ubuntu-unity/daily-build-next |
153 | - dest: ubuntu-unity/next |
154 | + series: saucy |
155 | + ppa: ubuntu-unity/daily-build |
156 | extracheck: ps-generic-autopilot-release-testing |
157 | schedule: 0 4 * * 1-7 |
158 | dependencies: |
159 | @@ -16,15 +15,15 @@ |
160 | tests: camera_app mediaplayer_app |
161 | ci_default: |
162 | configurations: |
163 | - raring-armhf: |
164 | + saucy-armhf: |
165 | node_label: panda-pbuilder |
166 | archive_artifacts: '**/output/*deb' |
167 | publish_junit: False |
168 | - raring-amd64: |
169 | + saucy-amd64: |
170 | node_label: pbuilder |
171 | archive_artifacts: False |
172 | publish_junit: False |
173 | - raring-i386: |
174 | + saucy-i386: |
175 | node_label: pbuilder |
176 | archive_artifacts: False |
177 | publish_junit: False |
178 | @@ -57,7 +56,7 @@ |
179 | qtubuntu-media: |
180 | hooks: D08add_ppa-qt5-proper D09add_ppa-phablet-team-ppa B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov |
181 | configurations: |
182 | - raring-armhf: |
183 | + saucy-armhf: |
184 | archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml' |
185 | publish_coverage: '**/coverage.xml' |
186 | qtubuntu-media-signals: |
187 | @@ -65,6 +64,6 @@ |
188 | qtvideo-node: |
189 | hooks: D08add_ppa-qt5-proper D09add_ppa-phablet-team-ppa B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov |
190 | configurations: |
191 | - raring-armhf: |
192 | + saucy-armhf: |
193 | archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml' |
194 | publish_coverage: '**/results/coverage.xml' |
195 | |
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 | ci_default: |
201 | contact_email: allan.lesage@canonical.com |
202 | configurations: |
203 | - raring-amd64: |
204 | - node_label: pbuilder |
205 | - raring-i386: |
206 | - node_label: pbuilder |
207 | - raring-armhf: |
208 | + saucy-amd64: |
209 | + node_label: pbuilder |
210 | + saucy-i386: |
211 | + node_label: pbuilder |
212 | + saucy-armhf: |
213 | node_label: panda-pbuilder |
214 | projects: |
215 | android-audiosystem: |
216 | configurations: |
217 | - raring-i386: False |
218 | + saucy-i386: False |
219 | gnome-control-center-unity: |
220 | contact_email: francis.ginther@canonical.com |
221 | notify-osd: |
222 | |
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 | stack: |
228 | name: network |
229 | - series: raring |
230 | - ppa: ubuntu-unity/daily-build-next |
231 | - dest: ubuntu-unity/next |
232 | + series: saucy |
233 | + ppa: ubuntu-unity/daily-build |
234 | extracheck: ps-generic-autopilot-release-testing |
235 | schedule: 0 1 * * 1-7 |
236 | dependencies: |
237 | |
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 | stack: |
243 | name: oif |
244 | - series: raring |
245 | - ppa: ubuntu-unity/daily-build-next |
246 | - dest: ubuntu-unity/next |
247 | + series: saucy |
248 | + ppa: ubuntu-unity/daily-build |
249 | extracheck: ps-generic-autopilot-release-testing |
250 | schedule: 0 2 * * 1-7 |
251 | ci_default: |
252 | @@ -13,13 +12,13 @@ |
253 | hooks: H05set_package_version D00mbs_archive |
254 | hook_source: lp:~private-ps-quality-team/+junk/mbs-archive-hooks |
255 | configurations: |
256 | - raring-amd64: |
257 | - template: mbs-pbuilder-config.xml.tmpl |
258 | - node_label: pbuilder |
259 | - raring-i386: |
260 | - template: mbs-pbuilder-config.xml.tmpl |
261 | - node_label: pbuilder |
262 | - raring-armhf: |
263 | + saucy-amd64: |
264 | + template: mbs-pbuilder-config.xml.tmpl |
265 | + node_label: pbuilder |
266 | + saucy-i386: |
267 | + template: mbs-pbuilder-config.xml.tmpl |
268 | + node_label: pbuilder |
269 | + saucy-armhf: |
270 | template: mbs-pbuilder-config.xml.tmpl |
271 | node_label: panda-pbuilder |
272 | publish_coverage: False |
273 | @@ -28,7 +27,7 @@ |
274 | local_archive_tmp: /home/ubuntu/local-archive |
275 | local_archive_name: head.oif |
276 | local_archive_source: http://naartjie/archive/ |
277 | - local_archive_pocket: raring |
278 | + local_archive_pocket: saucy |
279 | dependencies: |
280 | - qa |
281 | test_parameters: |
282 | |
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 | stack: |
288 | name: phone |
289 | - series: raring |
290 | - ppa: ubuntu-unity/daily-build-next |
291 | - dest: ubuntu-unity/next |
292 | + series: saucy |
293 | + ppa: ubuntu-unity/daily-build |
294 | extracheck: False #ps-generic-autopilot-release-testing |
295 | schedule: 0 7 * * 1-7 |
296 | dependencies: |
297 | @@ -17,15 +16,15 @@ |
298 | tests: phone_app |
299 | ci_default: |
300 | configurations: |
301 | - raring-armhf: |
302 | + saucy-armhf: |
303 | node_label: panda-pbuilder |
304 | archive_artifacts: '**/output/*deb, **/*test*.xml, **/coverage.xml' |
305 | publish_coverage: '**/coverage.xml' |
306 | - raring-amd64: |
307 | + saucy-amd64: |
308 | node_label: pbuilder |
309 | archive_artifacts: '**/*test*.xml, **/coverage.xml' |
310 | publish_coverage: '**/coverage.xml' |
311 | - raring-i386: |
312 | + saucy-i386: |
313 | node_label: pbuilder |
314 | archive_artifacts: '**/*test*.xml, **/coverage.xml' |
315 | publish_coverage: '**/coverage.xml' |
316 | |
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 | stack: |
322 | name: platform |
323 | - series: raring |
324 | - ppa: ubuntu-unity/daily-build-next |
325 | - dest: ubuntu-unity/next |
326 | + series: saucy |
327 | + ppa: ubuntu-unity/daily-build |
328 | extracheck: False # Set to True to enable additional check step |
329 | schedule: 0 2 * * 1-7 |
330 | dependencies: |
331 | - qa |
332 | ci_default: |
333 | configurations: |
334 | - raring-armhf: |
335 | + saucy-armhf: |
336 | node_label: panda-pbuilder |
337 | archive_artifacts: '**/output/*deb' |
338 | - raring-amd64: |
339 | + saucy-amd64: |
340 | node_label: pbuilder |
341 | - raring-i386: |
342 | + saucy-i386: |
343 | node_label: pbuilder |
344 | hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper |
345 | parallel_jobs: 2 |
346 | @@ -25,8 +24,8 @@ |
347 | qtubuntu: |
348 | hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper A10checklicenseheaders |
349 | configurations: |
350 | - raring-i386: False |
351 | - raring-amd64: False |
352 | + saucy-i386: False |
353 | + saucy-amd64: False |
354 | qtubuntu-sensors: |
355 | dbus-cpp: |
356 | contact_email: thomas.voss@canonical.com |
357 | |
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 | stack: |
363 | name: qa |
364 | - series: raring |
365 | - ppa: ubuntu-unity/daily-build-next |
366 | - dest: ubuntu-unity/next |
367 | + series: saucy |
368 | + ppa: ubuntu-unity/daily-build |
369 | extracheck: ps-generic-autopilot-release-testing |
370 | schedule: 0 0 * * 1-7 |
371 | test_parameters: |
372 | |
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 | stack: |
378 | name: sdk |
379 | - series: raring |
380 | - ppa: ubuntu-unity/daily-build-next |
381 | - dest: ubuntu-unity/next |
382 | + series: saucy |
383 | + ppa: ubuntu-unity/daily-build |
384 | extracheck: ps-generic-autopilot-release-testing |
385 | schedule: 0 4 * * 1-7 |
386 | dependencies: |
387 | @@ -11,11 +10,11 @@ |
388 | ci_default: |
389 | contact_email: juhapekka.piiroinen@canonical.com |
390 | configurations: |
391 | - raring-amd64: |
392 | + saucy-amd64: |
393 | template: pbuilder-config.xml.tmpl |
394 | node_label: pbuilder |
395 | irc_notification: False |
396 | - raring-armhf: |
397 | + saucy-armhf: |
398 | template: pbuilder-config.xml.tmpl |
399 | node_label: panda-pbuilder |
400 | irc_notification: False |
401 | @@ -36,7 +35,7 @@ |
402 | publish_coverage: '**/results/coverage.xml' |
403 | publish_junit: '**/results/*test*.xml' |
404 | configurations: |
405 | - raring-armhf: |
406 | + saucy-armhf: |
407 | archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **/output/*deb' |
408 | autolanding: |
409 | distributions: precise,quantal,raring,saucy |
410 | |
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 | stack: |
416 | name: settings |
417 | series: saucy |
418 | - ppa: ubuntu-unity/daily-build-next |
419 | - dest: ubuntu-unity/next |
420 | + ppa: ubuntu-unity/daily-build |
421 | extracheck: False # Set to True to enable additional check step |
422 | schedule: 0 7 * * 1-7 |
423 | ci_default: |
424 | |
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 | stack: |
430 | name: unity |
431 | - series: raring |
432 | - ppa: ubuntu-unity/daily-build-next |
433 | - dest: ubuntu-unity/next |
434 | + series: saucy |
435 | + ppa: ubuntu-unity/daily-build |
436 | extracheck: ps-generic-autopilot-release-testing |
437 | schedule: 0 4 * * 1-7 |
438 | ci_default: |
439 | @@ -13,13 +12,13 @@ |
440 | hooks: H05set_package_version D00mbs_archive |
441 | hook_source: lp:~private-ps-quality-team/+junk/unity-hooks |
442 | configurations: |
443 | - raring-amd64: |
444 | - template: mbs-pbuilder-config.xml.tmpl |
445 | - node_label: pbuilder |
446 | - raring-i386: |
447 | - template: mbs-pbuilder-config.xml.tmpl |
448 | - node_label: pbuilder |
449 | - raring-armhf: |
450 | + saucy-amd64: |
451 | + template: mbs-pbuilder-config.xml.tmpl |
452 | + node_label: pbuilder |
453 | + saucy-i386: |
454 | + template: mbs-pbuilder-config.xml.tmpl |
455 | + node_label: pbuilder |
456 | + saucy-armhf: |
457 | template: mbs-pbuilder-config.xml.tmpl |
458 | node_label: panda-pbuilder |
459 | publish_coverage: False |
460 | @@ -28,13 +27,12 @@ |
461 | local_archive_login: ubuntu |
462 | local_archive_tmp: /home/ubuntu/local-archive |
463 | local_archive_source: http://naartjie/archive/ |
464 | - local_archive_pocket: raring |
465 | + local_archive_pocket: saucy |
466 | test_parameters: |
467 | testpackages: unity-autopilot |
468 | tests: unity |
469 | dependencies: |
470 | - - name: indicators |
471 | - release: raring |
472 | + - indicators |
473 | - oif |
474 | - webapp |
475 | - webcred |
476 | @@ -47,7 +45,7 @@ |
477 | publish_coverage: '**/results/coverage.xml' |
478 | publish_junit: '**/results/*test*xml' |
479 | configurations: |
480 | - raring-armhf: |
481 | + saucy-armhf: |
482 | hooks: H05set_package_version D00mbs_archive D10specifictests B05xsltproc B09copy_results |
483 | compiz: |
484 | daily_release: False # remember we don't want to land compiz trunk before activating this one |
485 | @@ -59,14 +57,14 @@ |
486 | autolanding: |
487 | hooks: H05set_package_version D00mbs_archive B09googletests_cmake H15enable_testing D10install_google_test H10enable_coverage B10gcovr_run D10install_lcov |
488 | configurations: |
489 | - raring-armhf: |
490 | + saucy-armhf: |
491 | hooks: H05set_package_version D00mbs_archive B09googletests_cmake H15enable_testing D10install_google_test |
492 | ci: |
493 | hooks: D00mbs_archive H15enable_testing D10install_google_test H10enable_coverage B10gcovr_run D10install_lcov B09googletests_cmake |
494 | configurations: |
495 | compiz-gles-ci: |
496 | template: False |
497 | - raring-armhf: |
498 | + saucy-armhf: |
499 | hooks: D00mbs_archive H15enable_testing D10install_google_test B09googletests_cmake D10install_valgrind |
500 | libunity: |
501 | libunity-misc: |
502 | @@ -77,7 +75,7 @@ |
503 | publish_junit: '**/results/*test*xml' |
504 | rebuild: unity |
505 | configurations: |
506 | - raring-armhf: |
507 | + saucy-armhf: |
508 | hooks: H05set_package_version D00mbs_archive B09googletests B09copy_results D10specifictests |
509 | unity: |
510 | build_timeout: 240 |
511 | @@ -86,13 +84,13 @@ |
512 | publish_coverage: '**/results/coverage.xml' |
513 | publish_junit: '**/results/*test*xml' |
514 | configurations: |
515 | - raring-armhf: |
516 | + saucy-armhf: |
517 | hooks: H05set_package_version D00mbs_archive D10install_google_test B09googletests B09copy_results |
518 | unity-asset-pool: |
519 | unity-lens-applications: |
520 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov |
521 | configurations: |
522 | - raring-armhf: |
523 | + saucy-armhf: |
524 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results |
525 | archive_artifacts: False |
526 | archive_artifacts: '**/results/**' |
527 | @@ -102,7 +100,7 @@ |
528 | unity-lens-music: |
529 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov |
530 | configurations: |
531 | - raring-armhf: |
532 | + saucy-armhf: |
533 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results |
534 | archive_artifacts: False |
535 | archive_artifacts: '**/results/**' |
536 | @@ -111,7 +109,7 @@ |
537 | unity-lens-shopping: |
538 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov |
539 | configurations: |
540 | - raring-armhf: |
541 | + saucy-armhf: |
542 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results |
543 | archive_artifacts: False |
544 | archive_artifacts: '**/results/**' |
545 | @@ -119,7 +117,7 @@ |
546 | unity-lens-video: |
547 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov |
548 | configurations: |
549 | - raring-armhf: |
550 | + saucy-armhf: |
551 | hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results |
552 | archive_artifacts: False |
553 | 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.