cupstream2distro Configuration

Merge lp:~sergiusens/cupstream2distro-config/phablet-raring into lp:cupstream2distro-config

  1. phablet-raring
  2. Merge into trunk
Proposed by Sergio Schvezov
Status: Merged
Approved by: Martin Mrazik
Approved revision: 89
Merged at revision: 95
Proposed branch: lp:~sergiusens/cupstream2distro-config/phablet-raring
Merge into: lp:cupstream2distro-config
Diff against target: 221 lines (+86/-2)
5 files modified
stacks/phablet/apps.cfg (+20/-2)
stacks/phablet/extras.cfg (+7/-0)
stacks/phablet/misc.cfg (+11/-0)
stacks/phablet/qt.cfg (+31/-0)
stacks/phablet/shell.cfg (+17/-0)
To merge this branch: bzr merge lp:~sergiusens/cupstream2distro-config/phablet-raring
Reviewer Review Type Date Requested Status
Martin Mrazik (community) Approve
Francis Ginther Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+154089@code.launchpad.net

Commit message

Enabling raring builds for phablet

Description of the change

Enabling raring builds for phablet

For this to work the ppa:phablet-team needs to be prepopulated with the interdependent packages required for building

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

PASSED: Continuous integration, rev:88
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-raring-amd64-ci/37/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/37/rebuild

review: Approve (continuous-integration)
Revision history for this message
Martin Mrazik (mrazik) wrote :

It looks OK to me.

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

This all looks good.

One comment for the future, the following is not needed:
template: pbuilder-config.xml.tmpl

pbuilder-config.xml.tmpl is set as the default build_template file in ci/config/defaults.conf. Any configuration will use this by default. There is no harm in specifying it again.

review: Approve
Revision history for this message
Martin Mrazik (mrazik) wrote :

in the phone-app configurations, the publish_junit needs to be set to False (just fixed this in trunk for the quantal configs).

review: Needs Fixing
lp:~sergiusens/cupstream2distro-config/phablet-raring updated
89. By Sergio Schvezov

Merging trunk and keeping test publishing for phone-app

Revision history for this message
Sergio Schvezov (sergiusens) wrote :

> in the phone-app configurations, the publish_junit needs to be set to False
> (just fixed this in trunk for the quantal configs).

I remerged trunk and readded the tests as boiko has fixed them

Revision history for this message
Martin Mrazik (mrazik) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'stacks/phablet/apps.cfg'
--- stacks/phablet/apps.cfg 2013-03-20 10:04:35 +0000
+++ stacks/phablet/apps.cfg 2013-03-20 15:22:22 +0000
@@ -17,6 +17,16 @@
17 template: pbuilder-config.xml.tmpl17 template: pbuilder-config.xml.tmpl
18 archive_artifacts: '**/output/*deb'18 archive_artifacts: '**/output/*deb'
19 publish_junit: False19 publish_junit: False
20 raring-i386:
21 node_label: pbuilder
22 template: pbuilder-config.xml.tmpl
23 publish_junit: False
24 archive_artifacts: False
25 raring-armhf:
26 node_label: panda-pbuilder
27 template: pbuilder-config.xml.tmpl
28 archive_artifacts: '**/output/*deb'
29 publish_junit: False
20 generic-mediumtests:30 generic-mediumtests:
21 template: False31 template: False
22 autolanding:32 autolanding:
@@ -37,11 +47,19 @@
37 quantal-i386:47 quantal-i386:
38 publish_coverage: '**/results/coverage.xml'48 publish_coverage: '**/results/coverage.xml'
39 archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml'49 archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml'
40 publish_junit: False50 publish_junit: '**/results/*test*.xml'
41 quantal-armhf:51 quantal-armhf:
42 publish_coverage: '**/results/coverage.xml'52 publish_coverage: '**/results/coverage.xml'
43 archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **/output/*deb'53 archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **/output/*deb'
44 publish_junit: False54 publish_junit: '**/results/*test*.xml'
55 raring-i386:
56 publish_coverage: '**/results/coverage.xml'
57 archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml'
58 publish_junit: '**/results/*test*.xml'
59 raring-armhf:
60 publish_coverage: '**/results/coverage.xml'
61 archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **/output/*deb'
62 publish_junit: '**/results/*test*.xml'
45 share-app:63 share-app:
46 test_suite: share_app64 test_suite: share_app
47 hooks: D08add_ppa-qt5-proper D09add_ppa-private-ps-quality-team-staging D09add_ppa-online-accounts-qt5-staging D09add_ppa-super-friends-ppa D09add_ppa-phablet-team-ppa A10checklicenseheaders65 hooks: D08add_ppa-qt5-proper D09add_ppa-private-ps-quality-team-staging D09add_ppa-online-accounts-qt5-staging D09add_ppa-super-friends-ppa D09add_ppa-phablet-team-ppa A10checklicenseheaders
4866
=== modified file 'stacks/phablet/extras.cfg'
--- stacks/phablet/extras.cfg 2013-03-13 14:31:36 +0000
+++ stacks/phablet/extras.cfg 2013-03-20 15:22:22 +0000
@@ -12,6 +12,13 @@
12 quantal-i386:12 quantal-i386:
13 node_label: pbuilder-master13 node_label: pbuilder-master
14 template: pbuilder-config.xml.tmpl14 template: pbuilder-config.xml.tmpl
15 raring-armhf:
16 node_label: panda-pbuilder
17 template: pbuilder-config.xml.tmpl
18 archive_artifacts: '**/output/*deb'
19 raring-i386:
20 node_label: pbuilder-master
21 template: pbuilder-config.xml.tmpl
15 autolanding:22 autolanding:
16 landing_job: phablet-land23 landing_job: phablet-land
17 distributions: quantal24 distributions: quantal
1825
=== modified file 'stacks/phablet/misc.cfg'
--- stacks/phablet/misc.cfg 2013-03-18 13:41:43 +0000
+++ stacks/phablet/misc.cfg 2013-03-20 15:22:22 +0000
@@ -1,3 +1,4 @@
1# TODO separate into platform, middleware and tools
1stack:2stack:
2 name: misc3 name: misc
3 ppa: null4 ppa: null
@@ -9,6 +10,12 @@
9 quantal-i386:10 quantal-i386:
10 node_label: pbuilder-master11 node_label: pbuilder-master
11 template: pbuilder-config.xml.tmpl12 template: pbuilder-config.xml.tmpl
13 raring-armhf:
14 node_label: panda-pbuilder
15 template: pbuilder-config.xml.tmpl
16 raring-i386:
17 node_label: pbuilder-master
18 template: pbuilder-config.xml.tmpl
12 autolanding:19 autolanding:
13 landing_job: phablet-land20 landing_job: phablet-land
14 parallel_jobs: 221 parallel_jobs: 2
@@ -21,6 +28,7 @@
21 android-audiosystem:28 android-audiosystem:
22 configurations:29 configurations:
23 quantal-i386: False30 quantal-i386: False
31 raring-i386: False
24 gps-service:32 gps-service:
25 hooks: D08add_ppa-qt5-proper D09add_ppa-phablet-team-ppa33 hooks: D08add_ppa-qt5-proper D09add_ppa-phablet-team-ppa
26 session-manager:34 session-manager:
@@ -30,12 +38,15 @@
30 hooks: D09add_ppa-phablet-team-ppa38 hooks: D09add_ppa-phablet-team-ppa
31 configurations:39 configurations:
32 quantal-i386: False40 quantal-i386: False
41 raring-i386: False
33 platform-api:42 platform-api:
34 configurations:43 configurations:
35 quantal-i386: False44 quantal-i386: False
45 raring-i386: False
36 hooks: D09add_ppa-phablet-team-ppa 46 hooks: D09add_ppa-phablet-team-ppa
37 phablet-tools:47 phablet-tools:
38 configurations:48 configurations:
39 quantal-armhf: False49 quantal-armhf: False
50 raring-armhf: False
40 autolanding:51 autolanding:
41 landing_job: phablet-tools-land52 landing_job: phablet-tools-land
4253
=== modified file 'stacks/phablet/qt.cfg'
--- stacks/phablet/qt.cfg 2013-03-18 08:58:24 +0000
+++ stacks/phablet/qt.cfg 2013-03-20 15:22:22 +0000
@@ -1,3 +1,4 @@
1# TODO move to middleware
1stack:2stack:
2 name: qt3 name: qt
3 ppa: null4 ppa: null
@@ -13,6 +14,13 @@
13 quantal-i386:14 quantal-i386:
14 node_label: pbuilder-master15 node_label: pbuilder-master
15 template: pbuilder-config.xml.tmpl16 template: pbuilder-config.xml.tmpl
17 raring-armhf:
18 node_label: panda-pbuilder
19 template: pbuilder-config.xml.tmpl
20 archive_artifacts: '**/output/*deb'
21 raring-i386:
22 node_label: pbuilder-master
23 template: pbuilder-config.xml.tmpl
16 autolanding:24 autolanding:
17 landing_job: phablet-land25 landing_job: phablet-land
18 distributions: quantal26 distributions: quantal
@@ -20,6 +28,9 @@
20 quantal-i386:28 quantal-i386:
21 node_label: pbuilder-master29 node_label: pbuilder-master
22 template: pbuilder-config.xml.tmpl30 template: pbuilder-config.xml.tmpl
31 raring-i386:
32 node_label: pbuilder-master
33 template: pbuilder-config.xml.tmpl
23 parallel_jobs: 234 parallel_jobs: 2
24 contact_email: martin.mrazik@canonical.com #TODO: change to sergio or somebody else35 contact_email: martin.mrazik@canonical.com #TODO: change to sergio or somebody else
25 use_description_for_commit: False36 use_description_for_commit: False
@@ -46,6 +57,11 @@
46 node_label: panda-pbuilder57 node_label: panda-pbuilder
47 template: pbuilder-config.xml.tmpl58 template: pbuilder-config.xml.tmpl
48 archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'59 archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
60 raring-i386: False
61 raring-armhf:
62 node_label: panda-pbuilder
63 template: pbuilder-config.xml.tmpl
64 archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
49 autolanding:65 autolanding:
50 configurations:66 configurations:
51 quantal-i386: False67 quantal-i386: False
@@ -53,6 +69,11 @@
53 node_label: panda-pbuilder69 node_label: panda-pbuilder
54 template: pbuilder-config.xml.tmpl70 template: pbuilder-config.xml.tmpl
55 archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'71 archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
72 raring-i386: False
73 raring-armhf:
74 node_label: panda-pbuilder
75 template: pbuilder-config.xml.tmpl
76 archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
56 use_description_for_commit: True77 use_description_for_commit: True
57 hooks: D08add_ppa-qt5-proper D09add_ppa-phablet-team-ppa B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov78 hooks: D08add_ppa-qt5-proper D09add_ppa-phablet-team-ppa B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov
58 publish_coverage: "**/results/coverage.xml"79 publish_coverage: "**/results/coverage.xml"
@@ -70,6 +91,11 @@
70 node_label: panda-pbuilder91 node_label: panda-pbuilder
71 template: pbuilder-config.xml.tmpl92 template: pbuilder-config.xml.tmpl
72 archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'93 archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
94 raring-i386: False
95 raring-armhf:
96 node_label: panda-pbuilder
97 template: pbuilder-config.xml.tmpl
98 archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
73 autolanding:99 autolanding:
74 configurations:100 configurations:
75 quantal-i386: False101 quantal-i386: False
@@ -77,5 +103,10 @@
77 node_label: panda-pbuilder103 node_label: panda-pbuilder
78 template: pbuilder-config.xml.tmpl104 template: pbuilder-config.xml.tmpl
79 archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'105 archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
106 raring-i386: False
107 raring-armhf:
108 node_label: panda-pbuilder
109 template: pbuilder-config.xml.tmpl
110 archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
80 hooks: D08add_ppa-qt5-proper D09add_ppa-phablet-team-ppa B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov111 hooks: D08add_ppa-qt5-proper D09add_ppa-phablet-team-ppa B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov
81 publish_coverage: "**/results/coverage.xml"112 publish_coverage: "**/results/coverage.xml"
82113
=== modified file 'stacks/phablet/shell.cfg'
--- stacks/phablet/shell.cfg 2013-03-19 11:54:48 +0000
+++ stacks/phablet/shell.cfg 2013-03-20 15:22:22 +0000
@@ -12,6 +12,13 @@
12 quantal-i386:12 quantal-i386:
13 node_label: pbuilder-master13 node_label: pbuilder-master
14 template: pbuilder-config.xml.tmpl14 template: pbuilder-config.xml.tmpl
15 raring-armhf:
16 node_label: panda-pbuilder
17 template: pbuilder-config.xml.tmpl
18 archive_artifacts: '**/output/*deb'
19 raring-i386:
20 node_label: pbuilder-master
21 template: pbuilder-config.xml.tmpl
15 autolanding:22 autolanding:
16 landing_job: phablet-land23 landing_job: phablet-land
17 distributions: quantal24 distributions: quantal
@@ -39,6 +46,16 @@
39 template: pbuilder-config.xml.tmpl46 template: pbuilder-config.xml.tmpl
40 archive_artifacts: '**/output/*deb'47 archive_artifacts: '**/output/*deb'
41 publish_junit: False48 publish_junit: False
49 raring-i386:
50 node_label: pbuilder
51 template: pbuilder-config.xml.tmpl
52 publish_junit: False
53 archive_artifacts: False
54 raring-armhf:
55 node_label: panda-pbuilder
56 template: pbuilder-config.xml.tmpl
57 archive_artifacts: '**/output/*deb'
58 publish_junit: False
42 libunity:59 libunity:
43 target_branch: lp:libunity/phablet60 target_branch: lp:libunity/phablet
44 build_timeout: 36061 build_timeout: 360

Subscribers

People subscribed via source and target branches

to all changes: