cupstream2distro Configuration

Merge lp:~vila/cupstream2distro-config/no-nvidia into lp:cupstream2distro-config

  1. no-nvidia
  2. Merge into trunk
Proposed by Vincent Ladeuil
Status: Merged
Merged at revision: 925
Proposed branch: lp:~vila/cupstream2distro-config/no-nvidia
Merge into: lp:cupstream2distro-config
Diff against target: 267 lines (+39/-20)
19 files modified
stacks/head/apps.cfg (+2/-1)
stacks/head/friends.cfg (+2/-1)
stacks/head/hud.cfg (+2/-1)
stacks/head/indicators.cfg (+2/-1)
stacks/head/location.cfg (+2/-1)
stacks/head/media.cfg (+2/-1)
stacks/head/network.cfg (+2/-1)
stacks/head/oif.cfg (+2/-1)
stacks/head/phone.cfg (+2/-1)
stacks/head/platform.cfg (+2/-1)
stacks/head/qa.cfg (+2/-1)
stacks/head/sdk.cfg (+2/-1)
stacks/head/services.cfg (+3/-2)
stacks/head/unity.cfg (+2/-1)
stacks/head/unity8.cfg (+2/-1)
stacks/head/webapp.cfg (+2/-1)
stacks/raring/indicators.cfg (+2/-1)
stacks/raring/oif.cfg (+2/-1)
stacks/raring/unity.cfg (+2/-1)
To merge this branch: bzr merge lp:~vila/cupstream2distro-config/no-nvidia
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Evan (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+195563@code.launchpad.net

Description of the change

Disabling autopilot-nvidia until we get a proper replacement.

As this is an emergency I left comments around.

The risk is to miss nvidia specific regressions.

The hope is to get some feedback about the others.

The short term goal is to get some results out of the ci engine asap.

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

FAILED: Continuous integration, rev:925
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~vila/cupstream2distro-config/no-nvidia/+merge/195563/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/588/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-saucy-amd64-ci/386

Click here to trigger a rebuild:
http://s-jenkins:8080/job/cupstream2distro-config-ci/588/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Evan (ev) wrote :

Looks good to me.

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

Looking good and redeploying that. Thanks

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-11-08 08:51:55 +0000
3+++ stacks/head/apps.cfg 2013-11-18 09:31:19 +0000
4@@ -13,7 +13,8 @@
5 - webcred
6 - webapp
7 test_parameters:
8- apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
9+ # vila 2013-11-18 pending nvidia restoration apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
10+ apmachines: qa-intel-4000 qa-radeon-7750
11 packages:
12 content-hub
13 gallery-app
14
15=== modified file 'stacks/head/friends.cfg'
16--- stacks/head/friends.cfg 2013-11-08 08:51:55 +0000
17+++ stacks/head/friends.cfg 2013-11-18 09:31:19 +0000
18@@ -10,7 +10,8 @@
19 - qa
20 - sdk
21 test_parameters:
22- apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
23+ # vila 2013-11-18 pending nvidia restoration apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
24+ apmachines: qa-intel-4000 qa-radeon-7750
25 packages:
26 account-plugin-foursquare
27 account-plugin-identica
28
29=== modified file 'stacks/head/hud.cfg'
30--- stacks/head/hud.cfg 2013-11-08 08:51:55 +0000
31+++ stacks/head/hud.cfg 2013-11-18 09:31:19 +0000
32@@ -20,7 +20,8 @@
33 contact_email: allan.lesage@canonical.com
34 use_description_for_commit: True
35 test_parameters:
36- apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
37+ # vila 2013-11-18 pending nvidia restoration apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
38+ apmachines: qa-intel-4000 qa-radeon-7750
39 packages:
40 hud
41 libhud-client2
42
43=== modified file 'stacks/head/indicators.cfg'
44--- stacks/head/indicators.cfg 2013-11-08 08:51:55 +0000
45+++ stacks/head/indicators.cfg 2013-11-18 09:31:19 +0000
46@@ -29,7 +29,8 @@
47 local_archive_source: http://naartjie/archive/
48 local_archive_pocket: trusty
49 test_parameters:
50- apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
51+ # vila 2013-11-18 pending nvidia restoration apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
52+ apmachines: qa-intel-4000 qa-radeon-7750
53 # remove indicator-netwok from the packages to tests, it's making the whole panel segfaulting
54 packages:
55 apparmor
56
57=== modified file 'stacks/head/location.cfg'
58--- stacks/head/location.cfg 2013-11-08 08:51:55 +0000
59+++ stacks/head/location.cfg 2013-11-18 09:31:19 +0000
60@@ -9,7 +9,8 @@
61 - qa
62 - platform
63 test_parameters:
64- apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
65+ # vila 2013-11-18 pending nvidia restoration apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
66+ apmachines: qa-intel-4000 qa-radeon-7750
67 packages:
68 testpackages:
69 tests:
70
71=== modified file 'stacks/head/media.cfg'
72--- stacks/head/media.cfg 2013-11-08 08:51:55 +0000
73+++ stacks/head/media.cfg 2013-11-18 09:31:19 +0000
74@@ -12,7 +12,8 @@
75 - sdk
76 - friends
77 test_parameters:
78- apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
79+ # vila 2013-11-18 pending nvidia restoration apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
80+ apmachines: qa-intel-4000 qa-radeon-7750
81 packages:
82 camera-app
83 cameraplugin-fake
84
85=== modified file 'stacks/head/network.cfg'
86--- stacks/head/network.cfg 2013-11-08 08:51:55 +0000
87+++ stacks/head/network.cfg 2013-11-18 09:31:19 +0000
88@@ -16,7 +16,8 @@
89 extracheck: False #ps-generic-autopilot-release-testing
90 schedule: 0 1 * * 1-7
91 test_parameters:
92- apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
93+ # vila 2013-11-18 pending nvidia restoration apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
94+ apmachines: qa-intel-4000 qa-radeon-7750
95 packages:
96 testpackages:
97 tests:
98
99=== modified file 'stacks/head/oif.cfg'
100--- stacks/head/oif.cfg 2013-11-08 08:51:55 +0000
101+++ stacks/head/oif.cfg 2013-11-18 09:31:19 +0000
102@@ -32,7 +32,8 @@
103 dependencies:
104 - qa
105 test_parameters:
106- apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
107+ # vila 2013-11-18 pending nvidia restoration apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
108+ apmachines: qa-intel-4000 qa-radeon-7750
109 packages:
110 libframe6
111 libgeis1
112
113=== modified file 'stacks/head/phone.cfg'
114--- stacks/head/phone.cfg 2013-11-08 08:51:55 +0000
115+++ stacks/head/phone.cfg 2013-11-18 09:31:19 +0000
116@@ -12,7 +12,8 @@
117 - hud
118 - sdk
119 test_parameters:
120- apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
121+ # vila 2013-11-18 pending nvidia restoration apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
122+ apmachines: qa-intel-4000 qa-radeon-7750
123 packages:
124 address-book-app
125 address-book-service
126
127=== modified file 'stacks/head/platform.cfg'
128--- stacks/head/platform.cfg 2013-11-08 08:51:55 +0000
129+++ stacks/head/platform.cfg 2013-11-18 09:31:19 +0000
130@@ -6,7 +6,8 @@
131 extracheck: autopilot-trusty-daily_release
132 manualpublish: True # XXX: as requested by asac, we're in manual mode!
133 test_parameters:
134- apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
135+ # vila 2013-11-18 pending nvidia restoration apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
136+ apmachines: qa-intel-4000 qa-radeon-7750
137 packages:
138 apparmor-easyprof
139 apparmor-easyprof-ubuntu
140
141=== modified file 'stacks/head/qa.cfg'
142--- stacks/head/qa.cfg 2013-11-08 10:04:58 +0000
143+++ stacks/head/qa.cfg 2013-11-18 09:31:19 +0000
144@@ -7,7 +7,8 @@
145 manualpublish: True # XXX: as requested by asac, we're in manual mode!
146 status_ignored: True
147 test_parameters:
148- apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
149+ # vila 2013-11-18 pending nvidia restoration apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
150+ apmachines: qa-intel-4000 qa-radeon-7750
151 # note: had to remove python-ubuntu-platform-api (armhf only)
152 packages:
153 autopilot-desktop
154
155=== modified file 'stacks/head/sdk.cfg'
156--- stacks/head/sdk.cfg 2013-11-13 07:29:24 +0000
157+++ stacks/head/sdk.cfg 2013-11-18 09:31:19 +0000
158@@ -27,7 +27,8 @@
159 ci:
160 use_description_for_commit: True
161 test_parameters:
162- apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
163+ # vila 2013-11-18 pending nvidia restoration apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
164+ apmachines: qa-intel-4000 qa-radeon-7750
165 packages:
166 hud
167 libhud2
168
169=== modified file 'stacks/head/services.cfg'
170--- stacks/head/services.cfg 2013-11-08 08:51:55 +0000
171+++ stacks/head/services.cfg 2013-11-18 09:31:19 +0000
172@@ -5,8 +5,9 @@
173 ppa: ubuntu-unity/daily-build
174 extracheck: autopilot-trusty-daily_release
175 manualpublish: True # XXX: as requested by asac, we're in manual mode!
176- test_parameters:
177- apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
178+ test_parameters:
179+ # vila 2013-11-18 pending nvidia restoration apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
180+ apmachines: qa-intel-4000 qa-radeon-7750
181 packages:
182 libandroid-properties1
183 libgflags2
184
185=== modified file 'stacks/head/unity.cfg'
186--- stacks/head/unity.cfg 2013-11-08 08:51:55 +0000
187+++ stacks/head/unity.cfg 2013-11-18 09:31:19 +0000
188@@ -30,7 +30,8 @@
189 local_archive_source: http://naartjie/archive/
190 local_archive_pocket: trusty
191 test_parameters:
192- apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
193+ # vila 2013-11-18 pending nvidia restoration apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
194+ apmachines: qa-intel-4000 qa-radeon-7750
195 packages:
196 accountsservice
197 anthy
198
199=== modified file 'stacks/head/unity8.cfg'
200--- stacks/head/unity8.cfg 2013-11-08 08:51:55 +0000
201+++ stacks/head/unity8.cfg 2013-11-18 09:31:19 +0000
202@@ -34,7 +34,8 @@
203 local_archive_source: http://naartjie/archive/
204 local_archive_pocket: trusty
205 test_parameters:
206- apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
207+ # vila 2013-11-18 pending nvidia restoration apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
208+ apmachines: qa-intel-4000 qa-radeon-7750
209 packages:
210 account-plugin-ubuntuone
211 content-hub
212
213=== modified file 'stacks/head/webapp.cfg'
214--- stacks/head/webapp.cfg 2013-11-08 08:51:55 +0000
215+++ stacks/head/webapp.cfg 2013-11-18 09:31:19 +0000
216@@ -6,7 +6,8 @@
217 extracheck: autopilot-trusty-daily_release
218 manualpublish: True # XXX: as requested by asac, we're in manual mode!
219 test_parameters:
220- apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
221+ # vila 2013-11-18 pending nvidia restoration apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
222+ apmachines: qa-intel-4000 qa-radeon-7750
223 packages:
224 chromium-browser
225 chromium-browser-l10n
226
227=== modified file 'stacks/raring/indicators.cfg'
228--- stacks/raring/indicators.cfg 2013-10-21 10:12:51 +0000
229+++ stacks/raring/indicators.cfg 2013-11-18 09:31:19 +0000
230@@ -18,7 +18,8 @@
231 distributions: raring
232 use_description_for_commit: True
233 test_parameters:
234- apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
235+ # vila 2013-11-18 pending nvidia restoration apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
236+ apmachines: qa-intel-4000 qa-radeon-7750
237 packages: bamfdaemon indicator-datetime indicator-messages indicator-application libindicator7 indicator-sound libmessaging-menu0 appmenu-gtk indicator-printers indicator-power appmenu-qt appmenu-gtk3 gir1.2-messagingmenu-1.0 indicator-appmenu libindicator3-7 libbamf3-1 libsync-menu1 libido3-0.1-0 gir1.2-syncmenu-0.1 libido3-0.1-0 libdbusmenu-glib4 indicator-bluetooth telepathy-indicator python-appindicator libappindicator3-1 libappindicator1 gir1.2-appindicator3-0.1 hud libdbusmenu-qt5 appmenu-qt5 gir1.2-dbusmenu-glib-0.4
238 testpackages: recordmydesktop python-autopilot unity-autopilot
239 tests: unity.tests.test_panel.PanelCrossMonitorsTests.test_hovering_indicators_on_multiple_monitors unity.tests.test_panel.PanelHoverTests.test_hovering_indicators_open_menus unity.tests.test_panel.PanelHoverTests.test_hovering_over_indicators_does_not_show_app_menus unity.tests.test_panel.PanelHoverTests.test_menus_and_btns_hidden_with_mouse_over_indicators unity.tests.test_panel.PanelIndicatorEntryTests.test_menu_closes_on_click_outside unity.tests.test_panel.PanelIndicatorEntryTests.test_menu_opens_closes_on_click unity.tests.test_panel.PanelIndicatorEntryTests.test_menu_opens_on_click unity.tests.test_panel.PanelKeyNavigationTests.test_panel_indicators_key_navigation_next_works unity.tests.test_panel.PanelKeyNavigationTests.test_panel_indicators_key_navigation_prev_works unity.tests.test_panel.PanelWindowButtonsTests.test_window_buttons_show_when_indicator_active_and_mouse_over_panel unity.tests.test_hud unity.tests.test_gobject_introspection unity.tests.test_search
240
241=== modified file 'stacks/raring/oif.cfg'
242--- stacks/raring/oif.cfg 2013-10-21 10:12:51 +0000
243+++ stacks/raring/oif.cfg 2013-11-18 09:31:19 +0000
244@@ -32,7 +32,8 @@
245 dependencies:
246 - qa
247 test_parameters:
248- apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
249+ # vila 2013-11-18 pending nvidia restoration apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
250+ apmachines: qa-intel-4000 qa-radeon-7750
251 packages: libgeis1 libframe6 libgrip0 libgrail6
252 testpackages: recordmydesktop python-autopilot unity-autopilot
253 tests: unity.tests.test_dash.DashRevealTests.test_alt_f4_close_dash
254
255=== modified file 'stacks/raring/unity.cfg'
256--- stacks/raring/unity.cfg 2013-10-21 10:12:51 +0000
257+++ stacks/raring/unity.cfg 2013-11-18 09:31:19 +0000
258@@ -30,7 +30,8 @@
259 local_archive_source: http://naartjie/archive/
260 local_archive_pocket: raring
261 test_parameters:
262- apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
263+ # vila 2013-11-18 pending nvidia restoration apmachines: autopilot-nvidia qa-intel-4000 qa-radeon-7750
264+ apmachines: qa-intel-4000 qa-radeon-7750
265 packages: libnux-4.0-0 unity-lens-photos libunity-misc4 libdee-1.0-4 compiz libdecoration0 compiz-gnome unity-lens-video unity-lens-files compiz-core unity nux-tools unity-scope-musicstores gir1.2-dee-1.0 libnux-4.0-common unity-common libunity-common gir1.2-unity-5.0 unity-lens-applications unity-lens-music unity-services libunity-core-6.0-5 unity-asset-pool libunity-protocol-private0 libunity9 unity-scope-video-remote unity-scope-gdrive compiz-plugins-default unity-lens-shopping libcompizconfig0
266 testpackages: recordmydesktop python-autopilot unity-autopilot
267 tests: unity

Subscribers

People subscribed via source and target branches

to all changes: