Merge lp:~sergiusens/cupstream2distro-config/quantal_less into lp:cupstream2distro-config

Proposed by Sergio Schvezov
Status: Merged
Approved by: Francis Ginther
Approved revision: 233
Merged at revision: 238
Proposed branch: lp:~sergiusens/cupstream2distro-config/quantal_less
Merge into: lp:cupstream2distro-config
Diff against target: 217 lines (+4/-76)
6 files modified
stacks/head/apps.cfg (+0/-20)
stacks/head/hud.cfg (+0/-6)
stacks/head/media.cfg (+0/-17)
stacks/head/misc.cfg (+2/-12)
stacks/head/phone.cfg (+0/-10)
stacks/head/platform.cfg (+2/-11)
To merge this branch: bzr merge lp:~sergiusens/cupstream2distro-config/quantal_less
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Didier Roche-Tolomelli Approve
Michael Zanetti (community) Approve
Francis Ginther Approve
Allan LeSage (community) Approve
Review via email: mp+160506@code.launchpad.net

Commit message

Removing quantal jobs and phablet-land from the head stack (except for mir)

To post a comment you must log in.
Revision history for this message
Francis Ginther (fginther) wrote :

In "head/misc.cfg", please add a raring-i386 builder under default:
  ci_default:
    contact_email: <email address hidden>
    use_description_for_commit: True
    configurations:
      raring-amd64:
        node_label: pbuilder
      raring-i386:
        node_label: pbuilder
      raring-armhf:
        node_label: panda-pbuilder

I found no other references to phablet-land and no references to quantal except in mir.cfg and qa.cfg where it is still desired.

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

> In "head/misc.cfg", please add a raring-i386 builder under default:
> ci_default:
> contact_email: <email address hidden>
> use_description_for_commit: True
> configurations:
> raring-amd64:
> node_label: pbuilder
> raring-i386:
> node_label: pbuilder
> raring-armhf:
> node_label: panda-pbuilder

Revision 233 adds raring-i386

> I found no other references to phablet-land and no references to quantal
> except in mir.cfg and qa.cfg where it is still desired.

Revision history for this message
Allan LeSage (allanlesage) wrote :

No objection :) .

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

Approve

review: Approve
Revision history for this message
Michael Zanetti (mzanetti) wrote :

Looks good. Regarding syntax checking and testing I have to rely on Francis.

Could we include removal of the shell quantal tasks too?

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

> Looks good. Regarding syntax checking and testing I have to rely on Francis.
>
> Could we include removal of the shell quantal tasks too?

Since it's not in head, I'll do it in another MR as it seems it's not daily releasing

Revision history for this message
Michael Zanetti (mzanetti) wrote :

ok. shell will be a different one. This one looks good to me

review: Approve
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

\o/

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
Approved revid is not set in launchpad (maybe a permission problem?).
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-autolanding/82/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-raring-amd64-autolanding/82

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stacks/head/apps.cfg'
2--- stacks/head/apps.cfg 2013-04-23 15:36:34 +0000
3+++ stacks/head/apps.cfg 2013-04-23 21:53:26 +0000
4@@ -17,14 +17,6 @@
5 contact_email: "michael.zanetti@canonical.com martin.mrazik@canonical.com"
6 use_description_for_commit: True
7 configurations:
8- quantal-i386:
9- node_label: pbuilder
10- publish_junit: False
11- archive_artifacts: False
12- quantal-armhf:
13- node_label: panda-pbuilder
14- archive_artifacts: '**/output/*deb'
15- publish_junit: False
16 raring-i386:
17 node_label: pbuilder
18 publish_junit: False
19@@ -37,22 +29,10 @@
20 node_label: panda-pbuilder
21 archive_artifacts: '**/output/*deb'
22 publish_junit: False
23- autolanding:
24- landing_job: phablet-land
25 hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper A10checklicenseheaders D09add_ppa-ubuntu-sdk-team-ppa
26 projects:
27 gallery-app:
28 configurations:
29- quantal-i386:
30- node_label: pbuilder
31- publish_junit: False
32- archive_artifacts: False
33- publish_coverage: False
34- quantal-armhf:
35- node_label: panda-pbuilder
36- archive_artifacts: '**/output/*deb'
37- publish_junit: False
38- publish_coverage: False
39 raring-i386:
40 node_label: pbuilder
41 publish_junit: False
42
43=== modified file 'stacks/head/hud.cfg'
44--- stacks/head/hud.cfg 2013-04-23 14:07:07 +0000
45+++ stacks/head/hud.cfg 2013-04-23 21:53:26 +0000
46@@ -36,11 +36,5 @@
47 hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper
48 ci:
49 configurations:
50- quantal-armhf:
51- node_label: panda-pbuilder
52- archive_artifacts: '**/output/*deb'
53 raring-armhf:
54 archive_artifacts: '**/output/*deb'
55- configurations:
56- quantal-i386:
57- node_label: pbuilder
58
59=== modified file 'stacks/head/media.cfg'
60--- stacks/head/media.cfg 2013-04-23 14:07:07 +0000
61+++ stacks/head/media.cfg 2013-04-23 21:53:26 +0000
62@@ -16,14 +16,6 @@
63 tests: camera_app mediaplayer_app
64 ci_default:
65 configurations:
66- quantal-armhf:
67- node_label: panda-pbuilder
68- archive_artifacts: '**/output/*deb'
69- publish_junit: False
70- quantal-i386:
71- node_label: pbuilder
72- archive_artifacts: False
73- publish_junit: False
74 raring-armhf:
75 node_label: panda-pbuilder
76 archive_artifacts: '**/output/*deb'
77@@ -36,8 +28,6 @@
78 node_label: pbuilder
79 archive_artifacts: False
80 publish_junit: False
81- autolanding:
82- landing_job: phablet-land
83 parallel_jobs: 2
84 contact_email: martin.mrazik@canonical.com
85 use_description_for_commit: False
86@@ -51,7 +41,6 @@
87 qtubuntu-camera:
88 hooks: D08add_ppa-qt5-proper D09add_ppa-phablet-team-ppa A10checklicenseheaders
89 configurations:
90- quantal-i386: False
91 raring-i386: False
92 raring-amd64: False
93 qtubuntu-cameraplugin-fake:
94@@ -59,9 +48,6 @@
95 qtubuntu-media:
96 hooks: D08add_ppa-qt5-proper D09add_ppa-phablet-team-ppa B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov
97 configurations:
98- quantal-i386: False
99- quantal-armhf:
100- archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
101 raring-amd64: False
102 raring-i386: False
103 raring-armhf:
104@@ -72,9 +58,6 @@
105 qtvideo-node:
106 hooks: D08add_ppa-qt5-proper D09add_ppa-phablet-team-ppa B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov
107 configurations:
108- quantal-i386: False
109- quantal-armhf:
110- archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
111 raring-amd64: False
112 raring-i386: False
113 raring-armhf:
114
115=== modified file 'stacks/head/misc.cfg'
116--- stacks/head/misc.cfg 2013-04-19 00:42:41 +0000
117+++ stacks/head/misc.cfg 2013-04-23 21:53:26 +0000
118@@ -11,22 +11,15 @@
119 configurations:
120 raring-amd64:
121 node_label: pbuilder
122+ raring-i386:
123+ node_label: pbuilder
124 raring-armhf:
125 node_label: panda-pbuilder
126 projects:
127 android-audiosystem:
128 configurations:
129- quantal-armhf:
130- node_label: panda-builder
131 raring-i386: False
132 phablet-tools:
133- configurations:
134- quantal-i386:
135- node_label: pbuilder-master
136- raring-i386:
137- node_label: pbuilder-master
138- raring-armhf: False
139- raring-amd64: False
140 autolanding:
141 landing_job: phablet-tools-land
142 contact_email: martin.mrazik@canonical.com
143@@ -46,9 +39,6 @@
144 template: False
145 # ubuntu-geoip: not done
146 ubuntu-themes:
147- configurations:
148- autolanding:
149- landing_job: phablet-land
150 ubuntu-wallpapers:
151 unico:
152 cov_stream: unico-13.04
153
154=== modified file 'stacks/head/phone.cfg'
155--- stacks/head/phone.cfg 2013-04-23 14:07:07 +0000
156+++ stacks/head/phone.cfg 2013-04-23 21:53:26 +0000
157@@ -17,14 +17,6 @@
158 tests: phone_app
159 ci_default:
160 configurations:
161- quantal-armhf:
162- node_label: panda-pbuilder
163- archive_artifacts: '**/output/*deb, **/test*.xml, **/coverage.xml'
164- publish_coverage: '**/coverage.xml'
165- quantal-i386:
166- node_label: pbuilder
167- archive_artifacts: '**/*test*.xml, **/coverage.xml'
168- publish_coverage: '**/coverage.xml'
169 raring-armhf:
170 node_label: panda-pbuilder
171 archive_artifacts: '**/output/*deb, **/*test*.xml, **/coverage.xml'
172@@ -37,8 +29,6 @@
173 node_label: pbuilder
174 archive_artifacts: '**/*test*.xml, **/coverage.xml'
175 publish_coverage: '**/coverage.xml'
176- autolanding:
177- landing_job: phablet-land
178 parallel_jobs: 2
179 contact_email: martin.mrazik@canonical.com
180 use_description_for_commit: False
181
182=== modified file 'stacks/head/platform.cfg'
183--- stacks/head/platform.cfg 2013-04-15 22:37:21 +0000
184+++ stacks/head/platform.cfg 2013-04-23 21:53:26 +0000
185@@ -9,11 +9,6 @@
186 - qa
187 ci_default:
188 configurations:
189- quantal-armhf:
190- node_label: panda-pbuilder
191- archive_artifacts: '**/output/*deb'
192- quantal-i386:
193- node_label: pbuilder
194 raring-armhf:
195 node_label: panda-pbuilder
196 archive_artifacts: '**/output/*deb'
197@@ -21,8 +16,6 @@
198 node_label: pbuilder
199 raring-i386:
200 node_label: pbuilder
201- autolanding:
202- landing_job: phablet-land
203 parallel_jobs: 2
204 contact_email: martin.mrazik@canonical.com
205 use_description_for_commit: False
206@@ -31,9 +24,7 @@
207 qtubuntu:
208 hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper A10checklicenseheaders
209 configurations:
210- quantal-armhf:
211- quantal-i386: False
212- raring-i386: False
213- raring-amd64: False
214+ raring-i386: False
215+ raring-amd64: False
216 qtubuntu-sensors:
217 build_timeout: 360

Subscribers

People subscribed via source and target branches

to all changes: