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

Proposed by Łukasz Zemczak
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
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

To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

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.

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

The ci portions look good. Approve.

review: Approve
Revision history for this message
Ł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.

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

Upstream merge changes look good.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'stacks/head/apps.cfg'
--- stacks/head/apps.cfg 2013-05-29 07:50:01 +0000
+++ stacks/head/apps.cfg 2013-06-03 16:26:46 +0000
@@ -1,8 +1,7 @@
1stack:1stack:
2 name: apps2 name: apps
3 series: raring3 series: saucy
4 ppa: ubuntu-unity/daily-build-next4 ppa: ubuntu-unity/daily-build
5 dest: ubuntu-unity/next
6 extracheck: ps-generic-autopilot-release-testing5 extracheck: ps-generic-autopilot-release-testing
7 schedule: 0 5 * * 1-76 schedule: 0 5 * * 1-7
8 dependencies:7 dependencies:
@@ -16,15 +15,15 @@
16 ci_default:15 ci_default:
17 use_description_for_commit: True16 use_description_for_commit: True
18 configurations:17 configurations:
19 raring-i386:18 saucy-i386:
20 node_label: pbuilder19 node_label: pbuilder
21 publish_junit: False20 publish_junit: False
22 archive_artifacts: False21 archive_artifacts: False
23 raring-amd64:22 saucy-amd64:
24 node_label: pbuilder23 node_label: pbuilder
25 publish_junit: False24 publish_junit: False
26 archive_artifacts: False25 archive_artifacts: False
27 raring-armhf:26 saucy-armhf:
28 node_label: panda-pbuilder27 node_label: panda-pbuilder
29 archive_artifacts: '**/output/*deb'28 archive_artifacts: '**/output/*deb'
30 publish_junit: False29 publish_junit: False
@@ -37,23 +36,23 @@
37 projects:36 projects:
38 gallery-app:37 gallery-app:
39 configurations:38 configurations:
40 raring-i386:39 saucy-i386:
41 node_label: pbuilder40 node_label: pbuilder
42 publish_junit: False 41 publish_junit: False
43 archive_artifacts: False42 archive_artifacts: False
44 publish_coverage: False43 publish_coverage: False
45 raring-amd64:44 saucy-amd64:
46 node_label: pbuilder45 node_label: pbuilder
47 publish_junit: False46 publish_junit: False
48 archive_artifacts: '**/coverage.xml'47 archive_artifacts: '**/coverage.xml'
49 publish_coverage: False48 publish_coverage: False
50 raring-armhf:49 saucy-armhf:
51 node_label: panda-pbuilder50 node_label: panda-pbuilder
52 archive_artifacts: '**/output/*deb'51 archive_artifacts: '**/output/*deb'
53 publish_junit: False52 publish_junit: False
54 publish_coverage: False53 publish_coverage: False
55 test_suite: gallery_app54 test_suite: gallery_app
56 aggregate_tests: raring-amd64 generic-mediumtests55 aggregate_tests: saucy-amd64 generic-mediumtests
57 archive_artifacts: '**/coverage.xml, **/*test*.xml'56 archive_artifacts: '**/coverage.xml, **/*test*.xml'
58 publish_coverage: '**/coverage.xml'57 publish_coverage: '**/coverage.xml'
59 hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper A10checklicenseheaders D09add_ppa-ubuntu-sdk-team-ppa D10install_lcov H10enable_coverage B10gcovr_run58 hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper A10checklicenseheaders D09add_ppa-ubuntu-sdk-team-ppa D10install_lcov H10enable_coverage B10gcovr_run
6059
=== modified file 'stacks/head/hud.cfg'
--- stacks/head/hud.cfg 2013-05-29 07:50:01 +0000
+++ stacks/head/hud.cfg 2013-06-03 16:26:46 +0000
@@ -1,8 +1,7 @@
1stack:1stack:
2 name: hud2 name: hud
3 series: raring3 series: saucy
4 ppa: ubuntu-unity/daily-build-next4 ppa: ubuntu-unity/daily-build
5 dest: ubuntu-unity/next
6 extracheck: ps-generic-autopilot-release-testing5 extracheck: ps-generic-autopilot-release-testing
7 schedule: 0 3 * * 1-76 schedule: 0 3 * * 1-7
8 dependencies:7 dependencies:
@@ -10,11 +9,11 @@
10 - indicators9 - indicators
11 ci_default:10 ci_default:
12 configurations:11 configurations:
13 raring-i386:12 saucy-i386:
14 node_label: pbuilder13 node_label: pbuilder
15 raring-amd64:14 saucy-amd64:
16 node_label: pbuilder15 node_label: pbuilder
17 raring-armhf:16 saucy-armhf:
18 node_label: panda-pbuilder17 node_label: panda-pbuilder
19 parallel_jobs: 218 parallel_jobs: 2
20 contact_email: allan.lesage@canonical.com19 contact_email: allan.lesage@canonical.com
@@ -28,7 +27,7 @@
28 hud:27 hud:
29 hooks: D09add_ppa-private-ps-quality-team-staging B10gcovr_run H10enable_coverage D10install_lcov B09copy_results D10install_gtester2xunit28 hooks: D09add_ppa-private-ps-quality-team-staging B10gcovr_run H10enable_coverage D10install_lcov B09copy_results D10install_gtester2xunit
30 configurations:29 configurations:
31 raring-armhf: False30 saucy-armhf: False
32 archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **results/**'31 archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **results/**'
33 publish_coverage: '**/results/coverage.xml'32 publish_coverage: '**/results/coverage.xml'
34 publish_junit: '**/results/test*.xml'33 publish_junit: '**/results/test*.xml'
@@ -36,5 +35,5 @@
36 hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper35 hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper
37 ci:36 ci:
38 configurations:37 configurations:
39 raring-armhf:38 saucy-armhf:
40 archive_artifacts: '**/output/*deb'39 archive_artifacts: '**/output/*deb'
4140
=== modified file 'stacks/head/indicators.cfg'
--- stacks/head/indicators.cfg 2013-05-29 07:50:01 +0000
+++ stacks/head/indicators.cfg 2013-06-03 16:26:46 +0000
@@ -3,7 +3,7 @@
3 series: saucy3 series: saucy
4 ppa: ubuntu-unity/daily-build4 ppa: ubuntu-unity/daily-build
5 extracheck: ps-generic-autopilot-release-testing5 extracheck: ps-generic-autopilot-release-testing
6 #schedule: 0 2 * * 1-76 schedule: 0 2 * * 1-7
7 dependencies:7 dependencies:
8 - qa8 - qa
9 ci_default:9 ci_default:
1010
=== modified file 'stacks/head/location.cfg'
--- stacks/head/location.cfg 2013-05-29 07:50:01 +0000
+++ stacks/head/location.cfg 2013-06-03 16:26:46 +0000
@@ -1,8 +1,7 @@
1stack:1stack:
2 name: location2 name: location
3 series: raring3 series: saucy
4 ppa: ubuntu-unity/daily-build-next4 ppa: ubuntu-unity/daily-build
5 dest: ubuntu-unity/next
6 extracheck: ps-generic-autopilot-release-testing5 extracheck: ps-generic-autopilot-release-testing
7 schedule: 0 4 * * 1-76 schedule: 0 4 * * 1-7
8 dependencies:7 dependencies:
98
=== modified file 'stacks/head/media.cfg'
--- stacks/head/media.cfg 2013-05-29 07:50:01 +0000
+++ stacks/head/media.cfg 2013-06-03 16:26:46 +0000
@@ -1,8 +1,7 @@
1stack:1stack:
2 name: media2 name: media
3 series: raring3 series: saucy
4 ppa: ubuntu-unity/daily-build-next4 ppa: ubuntu-unity/daily-build
5 dest: ubuntu-unity/next
6 extracheck: ps-generic-autopilot-release-testing5 extracheck: ps-generic-autopilot-release-testing
7 schedule: 0 4 * * 1-76 schedule: 0 4 * * 1-7
8 dependencies:7 dependencies:
@@ -16,15 +15,15 @@
16 tests: camera_app mediaplayer_app15 tests: camera_app mediaplayer_app
17 ci_default:16 ci_default:
18 configurations:17 configurations:
19 raring-armhf:18 saucy-armhf:
20 node_label: panda-pbuilder19 node_label: panda-pbuilder
21 archive_artifacts: '**/output/*deb'20 archive_artifacts: '**/output/*deb'
22 publish_junit: False21 publish_junit: False
23 raring-amd64:22 saucy-amd64:
24 node_label: pbuilder23 node_label: pbuilder
25 archive_artifacts: False24 archive_artifacts: False
26 publish_junit: False25 publish_junit: False
27 raring-i386:26 saucy-i386:
28 node_label: pbuilder27 node_label: pbuilder
29 archive_artifacts: False28 archive_artifacts: False
30 publish_junit: False29 publish_junit: False
@@ -57,7 +56,7 @@
57 qtubuntu-media:56 qtubuntu-media:
58 hooks: D08add_ppa-qt5-proper D09add_ppa-phablet-team-ppa B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov57 hooks: D08add_ppa-qt5-proper D09add_ppa-phablet-team-ppa B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov
59 configurations:58 configurations:
60 raring-armhf:59 saucy-armhf:
61 archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'60 archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
62 publish_coverage: '**/coverage.xml'61 publish_coverage: '**/coverage.xml'
63 qtubuntu-media-signals:62 qtubuntu-media-signals:
@@ -65,6 +64,6 @@
65 qtvideo-node:64 qtvideo-node:
66 hooks: D08add_ppa-qt5-proper D09add_ppa-phablet-team-ppa B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov65 hooks: D08add_ppa-qt5-proper D09add_ppa-phablet-team-ppa B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov
67 configurations:66 configurations:
68 raring-armhf:67 saucy-armhf:
69 archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'68 archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
70 publish_coverage: '**/results/coverage.xml'69 publish_coverage: '**/results/coverage.xml'
7170
=== modified file 'stacks/head/misc.cfg'
--- stacks/head/misc.cfg 2013-05-29 18:40:37 +0000
+++ stacks/head/misc.cfg 2013-06-03 16:26:46 +0000
@@ -7,16 +7,16 @@
7 ci_default:7 ci_default:
8 contact_email: allan.lesage@canonical.com8 contact_email: allan.lesage@canonical.com
9 configurations:9 configurations:
10 raring-amd64:10 saucy-amd64:
11 node_label: pbuilder11 node_label: pbuilder
12 raring-i386:12 saucy-i386:
13 node_label: pbuilder13 node_label: pbuilder
14 raring-armhf:14 saucy-armhf:
15 node_label: panda-pbuilder15 node_label: panda-pbuilder
16 projects:16 projects:
17 android-audiosystem:17 android-audiosystem:
18 configurations:18 configurations:
19 raring-i386: False19 saucy-i386: False
20 gnome-control-center-unity:20 gnome-control-center-unity:
21 contact_email: francis.ginther@canonical.com21 contact_email: francis.ginther@canonical.com
22 notify-osd:22 notify-osd:
2323
=== modified file 'stacks/head/network.cfg'
--- stacks/head/network.cfg 2013-05-29 07:50:01 +0000
+++ stacks/head/network.cfg 2013-06-03 16:26:46 +0000
@@ -1,8 +1,7 @@
1stack:1stack:
2 name: network2 name: network
3 series: raring3 series: saucy
4 ppa: ubuntu-unity/daily-build-next4 ppa: ubuntu-unity/daily-build
5 dest: ubuntu-unity/next
6 extracheck: ps-generic-autopilot-release-testing5 extracheck: ps-generic-autopilot-release-testing
7 schedule: 0 1 * * 1-76 schedule: 0 1 * * 1-7
8 dependencies:7 dependencies:
98
=== modified file 'stacks/head/oif.cfg'
--- stacks/head/oif.cfg 2013-05-29 14:09:21 +0000
+++ stacks/head/oif.cfg 2013-06-03 16:26:46 +0000
@@ -1,8 +1,7 @@
1stack:1stack:
2 name: oif2 name: oif
3 series: raring3 series: saucy
4 ppa: ubuntu-unity/daily-build-next4 ppa: ubuntu-unity/daily-build
5 dest: ubuntu-unity/next
6 extracheck: ps-generic-autopilot-release-testing5 extracheck: ps-generic-autopilot-release-testing
7 schedule: 0 2 * * 1-76 schedule: 0 2 * * 1-7
8 ci_default:7 ci_default:
@@ -13,13 +12,13 @@
13 hooks: H05set_package_version D00mbs_archive12 hooks: H05set_package_version D00mbs_archive
14 hook_source: lp:~private-ps-quality-team/+junk/mbs-archive-hooks13 hook_source: lp:~private-ps-quality-team/+junk/mbs-archive-hooks
15 configurations:14 configurations:
16 raring-amd64:15 saucy-amd64:
17 template: mbs-pbuilder-config.xml.tmpl16 template: mbs-pbuilder-config.xml.tmpl
18 node_label: pbuilder17 node_label: pbuilder
19 raring-i386:18 saucy-i386:
20 template: mbs-pbuilder-config.xml.tmpl19 template: mbs-pbuilder-config.xml.tmpl
21 node_label: pbuilder20 node_label: pbuilder
22 raring-armhf:21 saucy-armhf:
23 template: mbs-pbuilder-config.xml.tmpl22 template: mbs-pbuilder-config.xml.tmpl
24 node_label: panda-pbuilder23 node_label: panda-pbuilder
25 publish_coverage: False24 publish_coverage: False
@@ -28,7 +27,7 @@
28 local_archive_tmp: /home/ubuntu/local-archive27 local_archive_tmp: /home/ubuntu/local-archive
29 local_archive_name: head.oif28 local_archive_name: head.oif
30 local_archive_source: http://naartjie/archive/29 local_archive_source: http://naartjie/archive/
31 local_archive_pocket: raring30 local_archive_pocket: saucy
32 dependencies:31 dependencies:
33 - qa32 - qa
34 test_parameters:33 test_parameters:
3534
=== modified file 'stacks/head/phone.cfg'
--- stacks/head/phone.cfg 2013-05-29 07:50:01 +0000
+++ stacks/head/phone.cfg 2013-06-03 16:26:46 +0000
@@ -1,8 +1,7 @@
1stack:1stack:
2 name: phone2 name: phone
3 series: raring3 series: saucy
4 ppa: ubuntu-unity/daily-build-next4 ppa: ubuntu-unity/daily-build
5 dest: ubuntu-unity/next
6 extracheck: False #ps-generic-autopilot-release-testing5 extracheck: False #ps-generic-autopilot-release-testing
7 schedule: 0 7 * * 1-76 schedule: 0 7 * * 1-7
8 dependencies:7 dependencies:
@@ -17,15 +16,15 @@
17 tests: phone_app16 tests: phone_app
18 ci_default:17 ci_default:
19 configurations:18 configurations:
20 raring-armhf:19 saucy-armhf:
21 node_label: panda-pbuilder20 node_label: panda-pbuilder
22 archive_artifacts: '**/output/*deb, **/*test*.xml, **/coverage.xml'21 archive_artifacts: '**/output/*deb, **/*test*.xml, **/coverage.xml'
23 publish_coverage: '**/coverage.xml'22 publish_coverage: '**/coverage.xml'
24 raring-amd64:23 saucy-amd64:
25 node_label: pbuilder24 node_label: pbuilder
26 archive_artifacts: '**/*test*.xml, **/coverage.xml'25 archive_artifacts: '**/*test*.xml, **/coverage.xml'
27 publish_coverage: '**/coverage.xml'26 publish_coverage: '**/coverage.xml'
28 raring-i386:27 saucy-i386:
29 node_label: pbuilder28 node_label: pbuilder
30 archive_artifacts: '**/*test*.xml, **/coverage.xml'29 archive_artifacts: '**/*test*.xml, **/coverage.xml'
31 publish_coverage: '**/coverage.xml'30 publish_coverage: '**/coverage.xml'
3231
=== modified file 'stacks/head/platform.cfg'
--- stacks/head/platform.cfg 2013-05-29 12:14:59 +0000
+++ stacks/head/platform.cfg 2013-06-03 16:26:46 +0000
@@ -1,20 +1,19 @@
1stack:1stack:
2 name: platform2 name: platform
3 series: raring3 series: saucy
4 ppa: ubuntu-unity/daily-build-next4 ppa: ubuntu-unity/daily-build
5 dest: ubuntu-unity/next
6 extracheck: False # Set to True to enable additional check step5 extracheck: False # Set to True to enable additional check step
7 schedule: 0 2 * * 1-76 schedule: 0 2 * * 1-7
8 dependencies:7 dependencies:
9 - qa8 - qa
10 ci_default:9 ci_default:
11 configurations:10 configurations:
12 raring-armhf:11 saucy-armhf:
13 node_label: panda-pbuilder12 node_label: panda-pbuilder
14 archive_artifacts: '**/output/*deb'13 archive_artifacts: '**/output/*deb'
15 raring-amd64:14 saucy-amd64:
16 node_label: pbuilder15 node_label: pbuilder
17 raring-i386:16 saucy-i386:
18 node_label: pbuilder17 node_label: pbuilder
19 hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper18 hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper
20 parallel_jobs: 219 parallel_jobs: 2
@@ -25,8 +24,8 @@
25 qtubuntu:24 qtubuntu:
26 hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper A10checklicenseheaders25 hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper A10checklicenseheaders
27 configurations:26 configurations:
28 raring-i386: False27 saucy-i386: False
29 raring-amd64: False28 saucy-amd64: False
30 qtubuntu-sensors:29 qtubuntu-sensors:
31 dbus-cpp:30 dbus-cpp:
32 contact_email: thomas.voss@canonical.com31 contact_email: thomas.voss@canonical.com
3332
=== modified file 'stacks/head/qa.cfg'
--- stacks/head/qa.cfg 2013-05-29 07:50:01 +0000
+++ stacks/head/qa.cfg 2013-06-03 16:26:46 +0000
@@ -1,8 +1,7 @@
1stack:1stack:
2 name: qa2 name: qa
3 series: raring3 series: saucy
4 ppa: ubuntu-unity/daily-build-next4 ppa: ubuntu-unity/daily-build
5 dest: ubuntu-unity/next
6 extracheck: ps-generic-autopilot-release-testing5 extracheck: ps-generic-autopilot-release-testing
7 schedule: 0 0 * * 1-76 schedule: 0 0 * * 1-7
8 test_parameters:7 test_parameters:
98
=== modified file 'stacks/head/sdk.cfg'
--- stacks/head/sdk.cfg 2013-05-29 07:50:01 +0000
+++ stacks/head/sdk.cfg 2013-06-03 16:26:46 +0000
@@ -1,8 +1,7 @@
1stack:1stack:
2 name: sdk2 name: sdk
3 series: raring3 series: saucy
4 ppa: ubuntu-unity/daily-build-next4 ppa: ubuntu-unity/daily-build
5 dest: ubuntu-unity/next
6 extracheck: ps-generic-autopilot-release-testing5 extracheck: ps-generic-autopilot-release-testing
7 schedule: 0 4 * * 1-76 schedule: 0 4 * * 1-7
8 dependencies:7 dependencies:
@@ -11,11 +10,11 @@
11 ci_default:10 ci_default:
12 contact_email: juhapekka.piiroinen@canonical.com11 contact_email: juhapekka.piiroinen@canonical.com
13 configurations:12 configurations:
14 raring-amd64:13 saucy-amd64:
15 template: pbuilder-config.xml.tmpl14 template: pbuilder-config.xml.tmpl
16 node_label: pbuilder15 node_label: pbuilder
17 irc_notification: False16 irc_notification: False
18 raring-armhf:17 saucy-armhf:
19 template: pbuilder-config.xml.tmpl18 template: pbuilder-config.xml.tmpl
20 node_label: panda-pbuilder19 node_label: panda-pbuilder
21 irc_notification: False20 irc_notification: False
@@ -36,7 +35,7 @@
36 publish_coverage: '**/results/coverage.xml'35 publish_coverage: '**/results/coverage.xml'
37 publish_junit: '**/results/*test*.xml'36 publish_junit: '**/results/*test*.xml'
38 configurations:37 configurations:
39 raring-armhf:38 saucy-armhf:
40 archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **/output/*deb'39 archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **/output/*deb'
41 autolanding:40 autolanding:
42 distributions: precise,quantal,raring,saucy41 distributions: precise,quantal,raring,saucy
4342
=== modified file 'stacks/head/settings.cfg'
--- stacks/head/settings.cfg 2013-05-30 15:42:55 +0000
+++ stacks/head/settings.cfg 2013-06-03 16:26:46 +0000
@@ -1,8 +1,7 @@
1stack:1stack:
2 name: settings2 name: settings
3 series: saucy3 series: saucy
4 ppa: ubuntu-unity/daily-build-next4 ppa: ubuntu-unity/daily-build
5 dest: ubuntu-unity/next
6 extracheck: False # Set to True to enable additional check step5 extracheck: False # Set to True to enable additional check step
7 schedule: 0 7 * * 1-76 schedule: 0 7 * * 1-7
8 ci_default:7 ci_default:
98
=== modified file 'stacks/head/unity.cfg'
--- stacks/head/unity.cfg 2013-05-29 14:09:21 +0000
+++ stacks/head/unity.cfg 2013-06-03 16:26:46 +0000
@@ -1,8 +1,7 @@
1stack:1stack:
2 name: unity2 name: unity
3 series: raring3 series: saucy
4 ppa: ubuntu-unity/daily-build-next4 ppa: ubuntu-unity/daily-build
5 dest: ubuntu-unity/next
6 extracheck: ps-generic-autopilot-release-testing5 extracheck: ps-generic-autopilot-release-testing
7 schedule: 0 4 * * 1-76 schedule: 0 4 * * 1-7
8 ci_default:7 ci_default:
@@ -13,13 +12,13 @@
13 hooks: H05set_package_version D00mbs_archive12 hooks: H05set_package_version D00mbs_archive
14 hook_source: lp:~private-ps-quality-team/+junk/unity-hooks13 hook_source: lp:~private-ps-quality-team/+junk/unity-hooks
15 configurations:14 configurations:
16 raring-amd64:15 saucy-amd64:
17 template: mbs-pbuilder-config.xml.tmpl16 template: mbs-pbuilder-config.xml.tmpl
18 node_label: pbuilder17 node_label: pbuilder
19 raring-i386:18 saucy-i386:
20 template: mbs-pbuilder-config.xml.tmpl19 template: mbs-pbuilder-config.xml.tmpl
21 node_label: pbuilder20 node_label: pbuilder
22 raring-armhf:21 saucy-armhf:
23 template: mbs-pbuilder-config.xml.tmpl22 template: mbs-pbuilder-config.xml.tmpl
24 node_label: panda-pbuilder23 node_label: panda-pbuilder
25 publish_coverage: False24 publish_coverage: False
@@ -28,13 +27,12 @@
28 local_archive_login: ubuntu27 local_archive_login: ubuntu
29 local_archive_tmp: /home/ubuntu/local-archive28 local_archive_tmp: /home/ubuntu/local-archive
30 local_archive_source: http://naartjie/archive/29 local_archive_source: http://naartjie/archive/
31 local_archive_pocket: raring30 local_archive_pocket: saucy
32 test_parameters:31 test_parameters:
33 testpackages: unity-autopilot32 testpackages: unity-autopilot
34 tests: unity33 tests: unity
35 dependencies:34 dependencies:
36 - name: indicators35 - indicators
37 release: raring
38 - oif36 - oif
39 - webapp37 - webapp
40 - webcred38 - webcred
@@ -47,7 +45,7 @@
47 publish_coverage: '**/results/coverage.xml'45 publish_coverage: '**/results/coverage.xml'
48 publish_junit: '**/results/*test*xml'46 publish_junit: '**/results/*test*xml'
49 configurations:47 configurations:
50 raring-armhf:48 saucy-armhf:
51 hooks: H05set_package_version D00mbs_archive D10specifictests B05xsltproc B09copy_results49 hooks: H05set_package_version D00mbs_archive D10specifictests B05xsltproc B09copy_results
52 compiz:50 compiz:
53 daily_release: False # remember we don't want to land compiz trunk before activating this one51 daily_release: False # remember we don't want to land compiz trunk before activating this one
@@ -59,14 +57,14 @@
59 autolanding:57 autolanding:
60 hooks: H05set_package_version D00mbs_archive B09googletests_cmake H15enable_testing D10install_google_test H10enable_coverage B10gcovr_run D10install_lcov58 hooks: H05set_package_version D00mbs_archive B09googletests_cmake H15enable_testing D10install_google_test H10enable_coverage B10gcovr_run D10install_lcov
61 configurations:59 configurations:
62 raring-armhf:60 saucy-armhf:
63 hooks: H05set_package_version D00mbs_archive B09googletests_cmake H15enable_testing D10install_google_test61 hooks: H05set_package_version D00mbs_archive B09googletests_cmake H15enable_testing D10install_google_test
64 ci:62 ci:
65 hooks: D00mbs_archive H15enable_testing D10install_google_test H10enable_coverage B10gcovr_run D10install_lcov B09googletests_cmake63 hooks: D00mbs_archive H15enable_testing D10install_google_test H10enable_coverage B10gcovr_run D10install_lcov B09googletests_cmake
66 configurations:64 configurations:
67 compiz-gles-ci:65 compiz-gles-ci:
68 template: False66 template: False
69 raring-armhf:67 saucy-armhf:
70 hooks: D00mbs_archive H15enable_testing D10install_google_test B09googletests_cmake D10install_valgrind68 hooks: D00mbs_archive H15enable_testing D10install_google_test B09googletests_cmake D10install_valgrind
71 libunity:69 libunity:
72 libunity-misc:70 libunity-misc:
@@ -77,7 +75,7 @@
77 publish_junit: '**/results/*test*xml'75 publish_junit: '**/results/*test*xml'
78 rebuild: unity76 rebuild: unity
79 configurations:77 configurations:
80 raring-armhf:78 saucy-armhf:
81 hooks: H05set_package_version D00mbs_archive B09googletests B09copy_results D10specifictests79 hooks: H05set_package_version D00mbs_archive B09googletests B09copy_results D10specifictests
82 unity:80 unity:
83 build_timeout: 24081 build_timeout: 240
@@ -86,13 +84,13 @@
86 publish_coverage: '**/results/coverage.xml'84 publish_coverage: '**/results/coverage.xml'
87 publish_junit: '**/results/*test*xml'85 publish_junit: '**/results/*test*xml'
88 configurations:86 configurations:
89 raring-armhf:87 saucy-armhf:
90 hooks: H05set_package_version D00mbs_archive D10install_google_test B09googletests B09copy_results88 hooks: H05set_package_version D00mbs_archive D10install_google_test B09googletests B09copy_results
91 unity-asset-pool:89 unity-asset-pool:
92 unity-lens-applications:90 unity-lens-applications:
93 hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov91 hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
94 configurations:92 configurations:
95 raring-armhf:93 saucy-armhf:
96 hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results94 hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results
97 archive_artifacts: False95 archive_artifacts: False
98 archive_artifacts: '**/results/**'96 archive_artifacts: '**/results/**'
@@ -102,7 +100,7 @@
102 unity-lens-music:100 unity-lens-music:
103 hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov101 hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
104 configurations:102 configurations:
105 raring-armhf:103 saucy-armhf:
106 hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results104 hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results
107 archive_artifacts: False105 archive_artifacts: False
108 archive_artifacts: '**/results/**'106 archive_artifacts: '**/results/**'
@@ -111,7 +109,7 @@
111 unity-lens-shopping:109 unity-lens-shopping:
112 hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov110 hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
113 configurations:111 configurations:
114 raring-armhf:112 saucy-armhf:
115 hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results113 hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results
116 archive_artifacts: False114 archive_artifacts: False
117 archive_artifacts: '**/results/**'115 archive_artifacts: '**/results/**'
@@ -119,7 +117,7 @@
119 unity-lens-video:117 unity-lens-video:
120 hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov118 hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
121 configurations:119 configurations:
122 raring-armhf:120 saucy-armhf:
123 hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results121 hooks: H05set_package_version D00mbs_archive D10specifictests B09copy_results
124 archive_artifacts: False122 archive_artifacts: False
125 archive_artifacts: '**/results/**'123 archive_artifacts: '**/results/**'

Subscribers

People subscribed via source and target branches

to all changes: