cupstream2distro Configuration

Merge lp:~timo-jyrinki/cupstream2distro-config/switch_from_next_to_daily into lp:cupstream2distro-config

  1. switch_from_next_to_daily
  2. Merge into trunk
Proposed by Timo Jyrinki
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 868
Merged at revision: 868
Proposed branch: lp:~timo-jyrinki/cupstream2distro-config/switch_from_next_to_daily
Merge into: lp:cupstream2distro-config
Diff against target: 307 lines (+22/-44)
22 files modified
stacks/head/apps.cfg (+1/-2)
stacks/head/click-package.cfg (+1/-2)
stacks/head/friends.cfg (+1/-2)
stacks/head/hud.cfg (+1/-2)
stacks/head/indicators.cfg (+1/-2)
stacks/head/location.cfg (+1/-2)
stacks/head/media.cfg (+1/-2)
stacks/head/mir.cfg (+1/-2)
stacks/head/misc.cfg (+1/-2)
stacks/head/network.cfg (+1/-2)
stacks/head/oif.cfg (+1/-2)
stacks/head/phone.cfg (+1/-2)
stacks/head/platform.cfg (+1/-2)
stacks/head/qa.cfg (+1/-2)
stacks/head/sdk.cfg (+1/-2)
stacks/head/services.cfg (+1/-2)
stacks/head/settings.cfg (+1/-2)
stacks/head/thin-client.cfg (+1/-2)
stacks/head/unity.cfg (+1/-2)
stacks/head/unity8.cfg (+1/-2)
stacks/head/webapp.cfg (+1/-2)
stacks/head/webcred.cfg (+1/-2)
To merge this branch: bzr merge lp:~timo-jyrinki/cupstream2distro-config/switch_from_next_to_daily
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Francis Ginther Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+192139@code.launchpad.net

Commit message

Switch to daily-build instead of -next and remove dest line

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

PASSED: Continuous integration, rev:868
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/570/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-saucy-amd64-ci/368

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/cupstream2distro-config-ci/570/rebuild

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

Approve for upstream merger.

review: Approve
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

(deployed, seems to work fine)

Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Oh right.

review: Approve

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-10-22 10:48:46 +0000
3+++ stacks/head/apps.cfg 2013-10-22 13:00:36 +0000
4@@ -2,8 +2,7 @@
5 name: apps
6 series: trusty
7 series-version: '14.04'
8- ppa: ubuntu-unity/daily-build-next
9- dest: ubuntu-unity/next
10+ ppa: ubuntu-unity/daily-build
11 extracheck: autopilot-trusty-daily_release
12 manualpublish: True # XXX: as requested by asac, we're in manual mode!
13 dependencies:
14
15=== modified file 'stacks/head/click-package.cfg'
16--- stacks/head/click-package.cfg 2013-10-22 10:48:46 +0000
17+++ stacks/head/click-package.cfg 2013-10-22 13:00:36 +0000
18@@ -2,8 +2,7 @@
19 name: click-package
20 series: trusty
21 series-version: '14.04'
22- ppa: ubuntu-unity/daily-build-next
23- dest: ubuntu-unity/next
24+ ppa: ubuntu-unity/daily-build
25 extracheck: False # Set to True to enable additional check step
26 manualpublish: True # XXX: as requested by asac, we're in manual mode!
27 ci_default:
28
29=== modified file 'stacks/head/friends.cfg'
30--- stacks/head/friends.cfg 2013-10-22 10:48:46 +0000
31+++ stacks/head/friends.cfg 2013-10-22 13:00:36 +0000
32@@ -2,8 +2,7 @@
33 name: friends
34 series: trusty
35 series-version: '14.04'
36- ppa: ubuntu-unity/daily-build-next
37- dest: ubuntu-unity/next
38+ ppa: ubuntu-unity/daily-build
39 extracheck: autopilot-trusty-daily_release
40 manualpublish: True # XXX: as requested by asac, we're in manual mode!
41 dependencies:
42
43=== modified file 'stacks/head/hud.cfg'
44--- stacks/head/hud.cfg 2013-10-22 10:48:46 +0000
45+++ stacks/head/hud.cfg 2013-10-22 13:00:36 +0000
46@@ -2,8 +2,7 @@
47 name: hud
48 series: trusty
49 series-version: '14.04'
50- ppa: ubuntu-unity/daily-build-next
51- dest: ubuntu-unity/next
52+ ppa: ubuntu-unity/daily-build
53 extracheck: autopilot-trusty-daily_release
54 manualpublish: True # XXX: as requested by asac, we're in manual mode!
55 dependencies:
56
57=== modified file 'stacks/head/indicators.cfg'
58--- stacks/head/indicators.cfg 2013-10-22 10:48:46 +0000
59+++ stacks/head/indicators.cfg 2013-10-22 13:00:36 +0000
60@@ -2,8 +2,7 @@
61 name: indicators
62 series: trusty
63 series-version: '14.04'
64- ppa: ubuntu-unity/daily-build-next
65- dest: ubuntu-unity/next
66+ ppa: ubuntu-unity/daily-build
67 extracheck: autopilot-trusty-daily_release
68 manualpublish: True # XXX: as requested by asac, we're in manual mode!
69 dependencies:
70
71=== modified file 'stacks/head/location.cfg'
72--- stacks/head/location.cfg 2013-10-22 08:55:21 +0000
73+++ stacks/head/location.cfg 2013-10-22 13:00:36 +0000
74@@ -2,8 +2,7 @@
75 name: location
76 series: trusty
77 series-version: '14.04'
78- ppa: ubuntu-unity/daily-build-next
79- dest: ubuntu-unity/next
80+ ppa: ubuntu-unity/daily-build
81 extracheck: autopilot-trusty-daily_release
82 manualpublish: True # XXX: as requested by asac, we're in manual mode!
83 dependencies:
84
85=== modified file 'stacks/head/media.cfg'
86--- stacks/head/media.cfg 2013-10-22 10:48:46 +0000
87+++ stacks/head/media.cfg 2013-10-22 13:00:36 +0000
88@@ -2,8 +2,7 @@
89 name: media
90 series: trusty
91 series-version: '14.04'
92- ppa: ubuntu-unity/daily-build-next
93- dest: ubuntu-unity/next
94+ ppa: ubuntu-unity/daily-build
95 extracheck: autopilot-trusty-daily_release
96 manualpublish: True # XXX: as requested by asac, we're in manual mode!
97 dependencies:
98
99=== modified file 'stacks/head/mir.cfg'
100--- stacks/head/mir.cfg 2013-10-22 10:48:46 +0000
101+++ stacks/head/mir.cfg 2013-10-22 13:00:36 +0000
102@@ -2,8 +2,7 @@
103 name: mir
104 series: trusty
105 series-version: '14.04'
106- ppa: ubuntu-unity/daily-build-next
107- dest: ubuntu-unity/next
108+ ppa: ubuntu-unity/daily-build
109 extracheck: False # checks are run in mirslave stack
110 manualpublish: True # XXX: as requested by asac, we're in manual mode!
111 ci_default:
112
113=== modified file 'stacks/head/misc.cfg'
114--- stacks/head/misc.cfg 2013-10-22 10:48:46 +0000
115+++ stacks/head/misc.cfg 2013-10-22 13:00:36 +0000
116@@ -2,8 +2,7 @@
117 name: misc
118 series: trusty
119 series-version: '14.04'
120- ppa: ubuntu-unity/daily-build-next
121- dest: ubuntu-unity/next
122+ ppa: ubuntu-unity/daily-build
123 extracheck: False # Set to True to enable additional check step
124 manualpublish: True # XXX: as requested by asac, we're in manual mode!
125 ci_default:
126
127=== modified file 'stacks/head/network.cfg'
128--- stacks/head/network.cfg 2013-10-22 10:48:46 +0000
129+++ stacks/head/network.cfg 2013-10-22 13:00:36 +0000
130@@ -2,8 +2,7 @@
131 name: network
132 series: trusty
133 series-version: '14.04'
134- ppa: ubuntu-unity/daily-build-next
135- dest: ubuntu-unity/next
136+ ppa: ubuntu-unity/daily-build
137 manualpublish: True # XXX: as requested by asac, we're in manual mode!
138 ci_default:
139 configurations:
140
141=== modified file 'stacks/head/oif.cfg'
142--- stacks/head/oif.cfg 2013-10-22 10:48:46 +0000
143+++ stacks/head/oif.cfg 2013-10-22 13:00:36 +0000
144@@ -2,8 +2,7 @@
145 name: oif
146 series: trusty
147 series-version: '14.04'
148- ppa: ubuntu-unity/daily-build-next
149- dest: ubuntu-unity/next
150+ ppa: ubuntu-unity/daily-build
151 extracheck: autopilot-trusty-daily_release
152 manualpublish: True # XXX: as requested by asac, we're in manual mode!
153 ci_default:
154
155=== modified file 'stacks/head/phone.cfg'
156--- stacks/head/phone.cfg 2013-10-22 10:48:46 +0000
157+++ stacks/head/phone.cfg 2013-10-22 13:00:36 +0000
158@@ -2,8 +2,7 @@
159 name: phone
160 series: trusty
161 series-version: '14.04'
162- ppa: ubuntu-unity/daily-build-next
163- dest: ubuntu-unity/next
164+ ppa: ubuntu-unity/daily-build
165 extracheck: autopilot-trusty-daily_release
166 manualpublish: True # XXX: as requested by asac, we're in manual mode!
167 dependencies:
168
169=== modified file 'stacks/head/platform.cfg'
170--- stacks/head/platform.cfg 2013-10-22 10:48:46 +0000
171+++ stacks/head/platform.cfg 2013-10-22 13:00:36 +0000
172@@ -2,8 +2,7 @@
173 name: platform
174 series: trusty
175 series-version: '14.04'
176- ppa: ubuntu-unity/daily-build-next
177- dest: ubuntu-unity/next
178+ ppa: ubuntu-unity/daily-build
179 extracheck: autopilot-trusty-daily_release
180 manualpublish: True # XXX: as requested by asac, we're in manual mode!
181 test_parameters:
182
183=== modified file 'stacks/head/qa.cfg'
184--- stacks/head/qa.cfg 2013-10-22 10:48:46 +0000
185+++ stacks/head/qa.cfg 2013-10-22 13:00:36 +0000
186@@ -2,8 +2,7 @@
187 name: qa
188 series: trusty
189 series-version: '14.04'
190- ppa: ubuntu-unity/daily-build-next
191- dest: ubuntu-unity/next
192+ ppa: ubuntu-unity/daily-build
193 extracheck: autopilot-trusty-daily_release
194 manualpublish: True # XXX: as requested by asac, we're in manual mode!
195 status_ignored: True
196
197=== modified file 'stacks/head/sdk.cfg'
198--- stacks/head/sdk.cfg 2013-10-22 10:48:46 +0000
199+++ stacks/head/sdk.cfg 2013-10-22 13:00:36 +0000
200@@ -2,8 +2,7 @@
201 name: sdk
202 series: trusty
203 series-version: '14.04'
204- ppa: ubuntu-unity/daily-build-next
205- dest: ubuntu-unity/next
206+ ppa: ubuntu-unity/daily-build
207 extracheck: autopilot-trusty-daily_release
208 manualpublish: True # XXX: as requested by asac, we're in manual mode!
209 dependencies:
210
211=== modified file 'stacks/head/services.cfg'
212--- stacks/head/services.cfg 2013-10-22 10:48:46 +0000
213+++ stacks/head/services.cfg 2013-10-22 13:00:36 +0000
214@@ -2,8 +2,7 @@
215 name: services
216 series: trusty
217 series-version: '14.04'
218- ppa: ubuntu-unity/daily-build-next
219- dest: ubuntu-unity/next
220+ ppa: ubuntu-unity/daily-build
221 extracheck: autopilot-trusty-daily_release
222 manualpublish: True # XXX: as requested by asac, we're in manual mode!
223 test_parameters:
224
225=== modified file 'stacks/head/settings.cfg'
226--- stacks/head/settings.cfg 2013-10-22 10:48:46 +0000
227+++ stacks/head/settings.cfg 2013-10-22 13:00:36 +0000
228@@ -2,8 +2,7 @@
229 name: settings
230 series: trusty
231 series-version: '14.04'
232- ppa: ubuntu-unity/daily-build-next
233- dest: ubuntu-unity/next
234+ ppa: ubuntu-unity/daily-build
235 extracheck: False # Set to True to enable additional check step
236 manualpublish: True # XXX: as requested by asac, we're in manual mode!
237 dependencies:
238
239=== modified file 'stacks/head/thin-client.cfg'
240--- stacks/head/thin-client.cfg 2013-10-22 10:48:46 +0000
241+++ stacks/head/thin-client.cfg 2013-10-22 13:00:36 +0000
242@@ -2,8 +2,7 @@
243 name: thin-client
244 series: trusty
245 series-version: '14.04'
246- ppa: ubuntu-unity/daily-build-next
247- dest: ubuntu-unity/next
248+ ppa: ubuntu-unity/daily-build
249 extracheck: False # Set to True to enable additional check step
250 manualpublish: True # XXX: as requested by asac, we're in manual mode!
251 ci_default:
252
253=== modified file 'stacks/head/unity.cfg'
254--- stacks/head/unity.cfg 2013-10-22 10:48:46 +0000
255+++ stacks/head/unity.cfg 2013-10-22 13:00:36 +0000
256@@ -2,8 +2,7 @@
257 name: unity
258 series: trusty
259 series-version: '14.04'
260- ppa: ubuntu-unity/daily-build-next
261- dest: ubuntu-unity/next
262+ ppa: ubuntu-unity/daily-build
263 extracheck: autopilot-trusty-daily_release
264 manualpublish: True # XXX: as requested by asac, we're in manual mode!
265 ci_default:
266
267=== modified file 'stacks/head/unity8.cfg'
268--- stacks/head/unity8.cfg 2013-10-22 11:34:59 +0000
269+++ stacks/head/unity8.cfg 2013-10-22 13:00:36 +0000
270@@ -2,8 +2,7 @@
271 name: unity8
272 series: trusty
273 series-version: '14.04'
274- ppa: ubuntu-unity/daily-build-next
275- dest: ubuntu-unity/next
276+ ppa: ubuntu-unity/daily-build
277 extracheck: autopilot-trusty-daily_release
278 manualpublish: True # XXX: as requested by asac, we're in manual mode!
279 dependencies:
280
281=== modified file 'stacks/head/webapp.cfg'
282--- stacks/head/webapp.cfg 2013-10-22 10:48:46 +0000
283+++ stacks/head/webapp.cfg 2013-10-22 13:00:36 +0000
284@@ -2,8 +2,7 @@
285 name: webapp
286 series: trusty
287 series-version: '14.04'
288- ppa: ubuntu-unity/daily-build-next
289- dest: ubuntu-unity/next
290+ ppa: ubuntu-unity/daily-build
291 extracheck: autopilot-trusty-daily_release
292 manualpublish: True # XXX: as requested by asac, we're in manual mode!
293 test_parameters:
294
295=== modified file 'stacks/head/webcred.cfg'
296--- stacks/head/webcred.cfg 2013-10-22 10:48:46 +0000
297+++ stacks/head/webcred.cfg 2013-10-22 13:00:36 +0000
298@@ -2,8 +2,7 @@
299 name: webcred
300 series: trusty
301 series-version: '14.04'
302- ppa: ubuntu-unity/daily-build-next
303- dest: ubuntu-unity/next
304+ ppa: ubuntu-unity/daily-build
305 extracheck: False # Set to True to enable additional check step
306 manualpublish: True # XXX: as requested by asac, we're in manual mode!
307 ci_default:

Subscribers

People subscribed via source and target branches

to all changes: