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
1=== modified file 'stacks/phablet/apps.cfg'
2--- stacks/phablet/apps.cfg 2013-03-20 10:04:35 +0000
3+++ stacks/phablet/apps.cfg 2013-03-20 15:22:22 +0000
4@@ -17,6 +17,16 @@
5 template: pbuilder-config.xml.tmpl
6 archive_artifacts: '**/output/*deb'
7 publish_junit: False
8+ raring-i386:
9+ node_label: pbuilder
10+ template: pbuilder-config.xml.tmpl
11+ publish_junit: False
12+ archive_artifacts: False
13+ raring-armhf:
14+ node_label: panda-pbuilder
15+ template: pbuilder-config.xml.tmpl
16+ archive_artifacts: '**/output/*deb'
17+ publish_junit: False
18 generic-mediumtests:
19 template: False
20 autolanding:
21@@ -37,11 +47,19 @@
22 quantal-i386:
23 publish_coverage: '**/results/coverage.xml'
24 archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml'
25- publish_junit: False
26+ publish_junit: '**/results/*test*.xml'
27 quantal-armhf:
28 publish_coverage: '**/results/coverage.xml'
29 archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **/output/*deb'
30- publish_junit: False
31+ publish_junit: '**/results/*test*.xml'
32+ raring-i386:
33+ publish_coverage: '**/results/coverage.xml'
34+ archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml'
35+ publish_junit: '**/results/*test*.xml'
36+ raring-armhf:
37+ publish_coverage: '**/results/coverage.xml'
38+ archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **/output/*deb'
39+ publish_junit: '**/results/*test*.xml'
40 share-app:
41 test_suite: share_app
42 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
43
44=== modified file 'stacks/phablet/extras.cfg'
45--- stacks/phablet/extras.cfg 2013-03-13 14:31:36 +0000
46+++ stacks/phablet/extras.cfg 2013-03-20 15:22:22 +0000
47@@ -12,6 +12,13 @@
48 quantal-i386:
49 node_label: pbuilder-master
50 template: pbuilder-config.xml.tmpl
51+ raring-armhf:
52+ node_label: panda-pbuilder
53+ template: pbuilder-config.xml.tmpl
54+ archive_artifacts: '**/output/*deb'
55+ raring-i386:
56+ node_label: pbuilder-master
57+ template: pbuilder-config.xml.tmpl
58 autolanding:
59 landing_job: phablet-land
60 distributions: quantal
61
62=== modified file 'stacks/phablet/misc.cfg'
63--- stacks/phablet/misc.cfg 2013-03-18 13:41:43 +0000
64+++ stacks/phablet/misc.cfg 2013-03-20 15:22:22 +0000
65@@ -1,3 +1,4 @@
66+# TODO separate into platform, middleware and tools
67 stack:
68 name: misc
69 ppa: null
70@@ -9,6 +10,12 @@
71 quantal-i386:
72 node_label: pbuilder-master
73 template: pbuilder-config.xml.tmpl
74+ raring-armhf:
75+ node_label: panda-pbuilder
76+ template: pbuilder-config.xml.tmpl
77+ raring-i386:
78+ node_label: pbuilder-master
79+ template: pbuilder-config.xml.tmpl
80 autolanding:
81 landing_job: phablet-land
82 parallel_jobs: 2
83@@ -21,6 +28,7 @@
84 android-audiosystem:
85 configurations:
86 quantal-i386: False
87+ raring-i386: False
88 gps-service:
89 hooks: D08add_ppa-qt5-proper D09add_ppa-phablet-team-ppa
90 session-manager:
91@@ -30,12 +38,15 @@
92 hooks: D09add_ppa-phablet-team-ppa
93 configurations:
94 quantal-i386: False
95+ raring-i386: False
96 platform-api:
97 configurations:
98 quantal-i386: False
99+ raring-i386: False
100 hooks: D09add_ppa-phablet-team-ppa
101 phablet-tools:
102 configurations:
103 quantal-armhf: False
104+ raring-armhf: False
105 autolanding:
106 landing_job: phablet-tools-land
107
108=== modified file 'stacks/phablet/qt.cfg'
109--- stacks/phablet/qt.cfg 2013-03-18 08:58:24 +0000
110+++ stacks/phablet/qt.cfg 2013-03-20 15:22:22 +0000
111@@ -1,3 +1,4 @@
112+# TODO move to middleware
113 stack:
114 name: qt
115 ppa: null
116@@ -13,6 +14,13 @@
117 quantal-i386:
118 node_label: pbuilder-master
119 template: pbuilder-config.xml.tmpl
120+ raring-armhf:
121+ node_label: panda-pbuilder
122+ template: pbuilder-config.xml.tmpl
123+ archive_artifacts: '**/output/*deb'
124+ raring-i386:
125+ node_label: pbuilder-master
126+ template: pbuilder-config.xml.tmpl
127 autolanding:
128 landing_job: phablet-land
129 distributions: quantal
130@@ -20,6 +28,9 @@
131 quantal-i386:
132 node_label: pbuilder-master
133 template: pbuilder-config.xml.tmpl
134+ raring-i386:
135+ node_label: pbuilder-master
136+ template: pbuilder-config.xml.tmpl
137 parallel_jobs: 2
138 contact_email: martin.mrazik@canonical.com #TODO: change to sergio or somebody else
139 use_description_for_commit: False
140@@ -46,6 +57,11 @@
141 node_label: panda-pbuilder
142 template: pbuilder-config.xml.tmpl
143 archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
144+ raring-i386: False
145+ raring-armhf:
146+ node_label: panda-pbuilder
147+ template: pbuilder-config.xml.tmpl
148+ archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
149 autolanding:
150 configurations:
151 quantal-i386: False
152@@ -53,6 +69,11 @@
153 node_label: panda-pbuilder
154 template: pbuilder-config.xml.tmpl
155 archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
156+ raring-i386: False
157+ raring-armhf:
158+ node_label: panda-pbuilder
159+ template: pbuilder-config.xml.tmpl
160+ archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
161 use_description_for_commit: True
162 hooks: D08add_ppa-qt5-proper D09add_ppa-phablet-team-ppa B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov
163 publish_coverage: "**/results/coverage.xml"
164@@ -70,6 +91,11 @@
165 node_label: panda-pbuilder
166 template: pbuilder-config.xml.tmpl
167 archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
168+ raring-i386: False
169+ raring-armhf:
170+ node_label: panda-pbuilder
171+ template: pbuilder-config.xml.tmpl
172+ archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
173 autolanding:
174 configurations:
175 quantal-i386: False
176@@ -77,5 +103,10 @@
177 node_label: panda-pbuilder
178 template: pbuilder-config.xml.tmpl
179 archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
180+ raring-i386: False
181+ raring-armhf:
182+ node_label: panda-pbuilder
183+ template: pbuilder-config.xml.tmpl
184+ archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
185 hooks: D08add_ppa-qt5-proper D09add_ppa-phablet-team-ppa B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov
186 publish_coverage: "**/results/coverage.xml"
187
188=== modified file 'stacks/phablet/shell.cfg'
189--- stacks/phablet/shell.cfg 2013-03-19 11:54:48 +0000
190+++ stacks/phablet/shell.cfg 2013-03-20 15:22:22 +0000
191@@ -12,6 +12,13 @@
192 quantal-i386:
193 node_label: pbuilder-master
194 template: pbuilder-config.xml.tmpl
195+ raring-armhf:
196+ node_label: panda-pbuilder
197+ template: pbuilder-config.xml.tmpl
198+ archive_artifacts: '**/output/*deb'
199+ raring-i386:
200+ node_label: pbuilder-master
201+ template: pbuilder-config.xml.tmpl
202 autolanding:
203 landing_job: phablet-land
204 distributions: quantal
205@@ -39,6 +46,16 @@
206 template: pbuilder-config.xml.tmpl
207 archive_artifacts: '**/output/*deb'
208 publish_junit: False
209+ raring-i386:
210+ node_label: pbuilder
211+ template: pbuilder-config.xml.tmpl
212+ publish_junit: False
213+ archive_artifacts: False
214+ raring-armhf:
215+ node_label: panda-pbuilder
216+ template: pbuilder-config.xml.tmpl
217+ archive_artifacts: '**/output/*deb'
218+ publish_junit: False
219 libunity:
220 target_branch: lp:libunity/phablet
221 build_timeout: 360

Subscribers

People subscribed via source and target branches

to all changes: