Merge lp:~jibel/update-manager/AutoUpgradeTester-profiles-amd64 into lp:update-manager

Proposed by Jean-Baptiste Lallement
Status: Merged
Merged at revision: 2287
Proposed branch: lp:~jibel/update-manager/AutoUpgradeTester-profiles-amd64
Merge into: lp:update-manager
Diff against target: 299 lines (+200/-1)
14 files modified
AutoUpgradeTester/profile/lts-server-amd64/DistUpgrade.cfg (+9/-0)
AutoUpgradeTester/profile/lts-server-amd64/DistUpgrade.cfg.dapper (+53/-0)
AutoUpgradeTester/profile/lts-server-amd64/local_testing.list (+1/-0)
AutoUpgradeTester/profile/lts-server-amd64/pkgs.cfg (+2/-0)
AutoUpgradeTester/profile/lts-ubuntu-amd64/DistUpgrade.cfg (+10/-0)
AutoUpgradeTester/profile/lts-ubuntu-amd64/DistUpgrade.cfg.dapper (+67/-0)
AutoUpgradeTester/profile/lts-ubuntu-amd64/pkgs.cfg (+2/-0)
AutoUpgradeTester/profile/main-all-amd64/DistUpgrade.cfg (+6/-0)
AutoUpgradeTester/profile/main-all-amd64/install_blacklist.cfg (+21/-0)
AutoUpgradeTester/profile/main-all-amd64/pkgs.cfg (+1/-0)
AutoUpgradeTester/profile/main-all/install_blacklist.cfg (+7/-1)
AutoUpgradeTester/profile/server-tasks-amd64/DistUpgrade.cfg (+6/-0)
AutoUpgradeTester/profile/server-tasks-amd64/pkgs.cfg (+9/-0)
AutoUpgradeTester/profile/ubuntu-amd64/DistUpgrade.cfg (+6/-0)
To merge this branch: bzr merge lp:~jibel/update-manager/AutoUpgradeTester-profiles-amd64
Reviewer Review Type Date Requested Status
Michael Vogt Pending
Review via email: mp+84389@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'AutoUpgradeTester/profile/lts-server-amd64'
2=== added file 'AutoUpgradeTester/profile/lts-server-amd64/DistUpgrade.cfg'
3--- AutoUpgradeTester/profile/lts-server-amd64/DistUpgrade.cfg 1970-01-01 00:00:00 +0000
4+++ AutoUpgradeTester/profile/lts-server-amd64/DistUpgrade.cfg 2011-12-03 23:51:23 +0000
5@@ -0,0 +1,9 @@
6+[DEFAULT]
7+SourceRelease=lucid
8+
9+[NonInteractive]
10+ProfileName=lts-server-amd64
11+AdditionalPkgs = pkgs.cfg
12+
13+[KVM]
14+Arch=amd64
15
16=== added file 'AutoUpgradeTester/profile/lts-server-amd64/DistUpgrade.cfg.dapper'
17--- AutoUpgradeTester/profile/lts-server-amd64/DistUpgrade.cfg.dapper 1970-01-01 00:00:00 +0000
18+++ AutoUpgradeTester/profile/lts-server-amd64/DistUpgrade.cfg.dapper 2011-12-03 23:51:23 +0000
19@@ -0,0 +1,53 @@
20+[View]
21+#View=DistUpgradeViewGtk
22+View=DistUpgradeViewNonInteractive
23+Depends=python-gnupginterface
24+
25+# Distro contains global information about the upgrade
26+[Distro]
27+# the meta-pkgs we support
28+MetaPkgs=ubuntu-standard
29+BaseMetaPkgs=ubuntu-minimal
30+Demotions=demotions.cfg
31+RemoveEssentialOk=sysvinit
32+AllowUnauthenticated=yes
33+
34+[Files]
35+BackupExt=distUpgrade
36+
37+[ubuntu-standard]
38+KeyDependencies=w3m, wget
39+
40+[Sources]
41+From=dapper
42+To=hardy
43+ValidOrigin=Ubuntu
44+ValidMirrors = mirrors.cfg
45+
46+[Network]
47+MaxRetries=3
48+
49+[PreRequists]
50+Packages=release-upgrader-apt,release-upgrader-dpkg
51+SourcesList=prerequists-sources.dapper.list
52+SourcesList-ia64=prerequists-sources.dapper-ports.list
53+SourcesList-hppa=prerequists-sources.dapper-ports.list
54+
55+[NonInteractive]
56+ProfileName=server
57+BasePkg = ubuntu-standard
58+AdditionalPkgs = pkgs.cfg
59+Mirror = http://archive.ubuntu.com/ubuntu
60+Proxy=http://192.168.1.1:3128/
61+ForceOverwrite=no
62+SSHKey=ssh-key
63+BaseImage=jeos/dapper-i386.qcow2
64+SwapImage=jeos/swap.qcow2
65+Components=main,restricted
66+Pockets=security,updates
67+UpgradeFromDistOnBoostrap=true
68+CacheBaseImage=yes
69+RealReboot=yes
70+; WARNING: if AddRepo is used, remember to set Distro/AllowUnauthenticted too
71+;AddRepo=local_testing.list
72+;PreRequistsFiles=backports/release-upgrader-apt_0.7.9ubuntu1_i386.udeb, backports/release-upgrader-dpkg_1.14.5ubuntu11.6_i386.udeb
73
74=== added file 'AutoUpgradeTester/profile/lts-server-amd64/local_testing.list'
75--- AutoUpgradeTester/profile/lts-server-amd64/local_testing.list 1970-01-01 00:00:00 +0000
76+++ AutoUpgradeTester/profile/lts-server-amd64/local_testing.list 2011-12-03 23:51:23 +0000
77@@ -0,0 +1,1 @@
78+deb http://ppa.launchpad.net/mvo/apt-lucid-chris/ubuntu lucid main
79
80=== added file 'AutoUpgradeTester/profile/lts-server-amd64/pkgs.cfg'
81--- AutoUpgradeTester/profile/lts-server-amd64/pkgs.cfg 1970-01-01 00:00:00 +0000
82+++ AutoUpgradeTester/profile/lts-server-amd64/pkgs.cfg 2011-12-03 23:51:23 +0000
83@@ -0,0 +1,2 @@
84+python-apt
85+python-gnupginterface
86\ No newline at end of file
87
88=== added symlink 'AutoUpgradeTester/profile/lts-server-amd64/prerequists-sources.dapper.list'
89=== target is u'../../DistUpgrade/prerequists-sources.dapper.list'
90=== added symlink 'AutoUpgradeTester/profile/lts-server-amd64/ssh-key'
91=== target is u'../../jeos/ssh-key'
92=== added directory 'AutoUpgradeTester/profile/lts-ubuntu-amd64'
93=== added file 'AutoUpgradeTester/profile/lts-ubuntu-amd64/DistUpgrade.cfg'
94--- AutoUpgradeTester/profile/lts-ubuntu-amd64/DistUpgrade.cfg 1970-01-01 00:00:00 +0000
95+++ AutoUpgradeTester/profile/lts-ubuntu-amd64/DistUpgrade.cfg 2011-12-03 23:51:23 +0000
96@@ -0,0 +1,10 @@
97+[DEFAULT]
98+SourceRelease=lucid
99+
100+[NonInteractive]
101+ProfileName=lts-ubuntu-amd64
102+BasePkg = ubuntu-desktop
103+
104+[KVM]
105+Arch=amd64
106+
107
108=== added file 'AutoUpgradeTester/profile/lts-ubuntu-amd64/DistUpgrade.cfg.dapper'
109--- AutoUpgradeTester/profile/lts-ubuntu-amd64/DistUpgrade.cfg.dapper 1970-01-01 00:00:00 +0000
110+++ AutoUpgradeTester/profile/lts-ubuntu-amd64/DistUpgrade.cfg.dapper 2011-12-03 23:51:23 +0000
111@@ -0,0 +1,67 @@
112+[View]
113+#View=DistUpgradeViewGtk
114+View=DistUpgradeViewNonInteractive
115+
116+# Distro contains global information about the upgrade
117+[Distro]
118+# the meta-pkgs we support
119+MetaPkgs=ubuntu-desktop, kubuntu-desktop, edubuntu-desktop, xubuntu-desktop
120+BaseMetaPkgs=ubuntu-minimal, ubuntu-standard
121+PostUpgradePurge=xorg-common, libgl1-mesa
122+Demotions=demoted.cfg
123+RemoveEssentialOk=sysvinit
124+RemovalBlacklistFile=removal_blacklist.cfg
125+AllowUnauthenticated=yes
126+PostInstallScripts=/usr/lib/udev/migrate-fstab-to-uuid.sh
127+
128+# information about the individual meta-pkgs
129+[ubuntu-desktop]
130+KeyDependencies=gdm, gnome-panel, ubuntu-artwork
131+# those pkgs will be marked remove right after the distUpgrade in the cache
132+PostUpgradeRemove=xchat, xscreensaver
133+
134+[kubuntu-desktop]
135+KeyDependencies=kdm, kicker, kubuntu-artwork-usplash
136+# those packages are marked as obsolete right after the upgrade
137+ForcedObsoletes=ivman
138+
139+[edubuntu-desktop]
140+KeyDependencies=edubuntu-artwork, tuxpaint
141+
142+[xubuntu-desktop]
143+KeyDependencies=xubuntu-artwork-usplash, xubuntu-default-settings, xfce4
144+
145+
146+[Files]
147+BackupExt=distUpgrade
148+
149+[PreRequists]
150+Packages=release-upgrader-apt,release-upgrader-dpkg
151+SourcesList=prerequists-sources.dapper.list
152+
153+[Sources]
154+From=dapper
155+To=hardy
156+ValidOrigin=Ubuntu
157+ValidMirrors = mirrors.cfg
158+
159+[Network]
160+MaxRetries=3
161+
162+[NonInteractive]
163+ProfileName = ubuntu
164+BasePkg = ubuntu-desktop
165+AdditionalPkgs = pkgs.cfg
166+Mirror = http://archive.ubuntu.com/ubuntu
167+Proxy=http://192.168.1.1:3128/
168+ForceOverwrite=yes
169+Components=main,restricted
170+Pockets=security,updates
171+SSHKey=ssh-key
172+BaseImage=jeos/dapper-i386.qcow2
173+CacheBaseImage=yes
174+SwapImage=jeos/swap.qcow2
175+UpgradeFromDistOnBootstrap=true
176+WorkaroundNetworkManager=true
177+; WARNING: if AddRepo is used, remember to set Distro/AllowUnauthenticted too
178+AddRepo=local_testing.list
179
180=== added file 'AutoUpgradeTester/profile/lts-ubuntu-amd64/pkgs.cfg'
181--- AutoUpgradeTester/profile/lts-ubuntu-amd64/pkgs.cfg 1970-01-01 00:00:00 +0000
182+++ AutoUpgradeTester/profile/lts-ubuntu-amd64/pkgs.cfg 2011-12-03 23:51:23 +0000
183@@ -0,0 +1,2 @@
184+ubuntu-minimal
185+ubuntu-standard
186\ No newline at end of file
187
188=== added symlink 'AutoUpgradeTester/profile/lts-ubuntu-amd64/prerequists-sources.dapper.list'
189=== target is u'../../DistUpgrade/prerequists-sources.dapper.list'
190=== added symlink 'AutoUpgradeTester/profile/lts-ubuntu-amd64/ssh-key'
191=== target is u'../../jeos/ssh-key'
192=== added directory 'AutoUpgradeTester/profile/main-all-amd64'
193=== added file 'AutoUpgradeTester/profile/main-all-amd64/DistUpgrade.cfg'
194--- AutoUpgradeTester/profile/main-all-amd64/DistUpgrade.cfg 1970-01-01 00:00:00 +0000
195+++ AutoUpgradeTester/profile/main-all-amd64/DistUpgrade.cfg 2011-12-03 23:51:23 +0000
196@@ -0,0 +1,6 @@
197+[NonInteractive]
198+ProfileName = main-all-amd64
199+PostBootstrapScript=/usr/share/pyshared/AutoUpgradeTester/install_all.py
200+
201+[KVM]
202+Arch=amd64
203
204=== added symlink 'AutoUpgradeTester/profile/main-all-amd64/demoted.cfg'
205=== target is u'../../DistUpgrade/demoted.cfg'
206=== added file 'AutoUpgradeTester/profile/main-all-amd64/install_blacklist.cfg'
207--- AutoUpgradeTester/profile/main-all-amd64/install_blacklist.cfg 1970-01-01 00:00:00 +0000
208+++ AutoUpgradeTester/profile/main-all-amd64/install_blacklist.cfg 2011-12-03 23:51:23 +0000
209@@ -0,0 +1,21 @@
210+# jaunty: endless loop with DEBIAN_FRONTEND=noninteractive
211+moodle
212+# has a funny "can not be upgraded automatically" policy
213+# see debian #368226
214+quagga
215+# not installable on a regular machine (preinst error)
216+ltsp-client
217+# gwenview-i18n has some file conflicts
218+gwenview-i18n
219+# ipppd needs MAKEDEV
220+ipppd
221+# cmake has incorrect emacs dependencies
222+cmake
223+# cluster manager hangs on shutdown
224+cman
225+
226+# Conflicts/uninstallable packages in Oneiric
227+libgladeui-doc
228+mythes-it
229+amavisd-new
230+grub-legacy-ec2
231
232=== added file 'AutoUpgradeTester/profile/main-all-amd64/pkgs.cfg'
233--- AutoUpgradeTester/profile/main-all-amd64/pkgs.cfg 1970-01-01 00:00:00 +0000
234+++ AutoUpgradeTester/profile/main-all-amd64/pkgs.cfg 2011-12-03 23:51:23 +0000
235@@ -0,0 +1,1 @@
236+python-apt
237
238=== added directory 'AutoUpgradeTester/profile/main-all-amd64/result'
239=== added symlink 'AutoUpgradeTester/profile/main-all-amd64/ssh-key'
240=== target is u'../../jeos/ssh-key'
241=== modified file 'AutoUpgradeTester/profile/main-all/install_blacklist.cfg'
242--- AutoUpgradeTester/profile/main-all/install_blacklist.cfg 2009-06-26 12:38:14 +0000
243+++ AutoUpgradeTester/profile/main-all/install_blacklist.cfg 2011-12-03 23:51:23 +0000
244@@ -12,4 +12,10 @@
245 # cmake has incorrect emacs dependencies
246 cmake
247 # cluster manager hangs on shutdown
248-cman
249\ No newline at end of file
250+cman
251+
252+# Conflicts/uninstallable packages in Oneiric
253+libgladeui-doc
254+mythes-it
255+amavisd-new
256+grub-legacy-ec2
257
258=== added directory 'AutoUpgradeTester/profile/server-tasks-amd64'
259=== added file 'AutoUpgradeTester/profile/server-tasks-amd64/DistUpgrade.cfg'
260--- AutoUpgradeTester/profile/server-tasks-amd64/DistUpgrade.cfg 1970-01-01 00:00:00 +0000
261+++ AutoUpgradeTester/profile/server-tasks-amd64/DistUpgrade.cfg 2011-12-03 23:51:23 +0000
262@@ -0,0 +1,6 @@
263+[NonInteractive]
264+ProfileName=server-tasks-amd64
265+AdditionalPkgs = pkgs.cfg
266+
267+[KVM]
268+Arch=amd64
269
270=== added file 'AutoUpgradeTester/profile/server-tasks-amd64/pkgs.cfg'
271--- AutoUpgradeTester/profile/server-tasks-amd64/pkgs.cfg 1970-01-01 00:00:00 +0000
272+++ AutoUpgradeTester/profile/server-tasks-amd64/pkgs.cfg 2011-12-03 23:51:23 +0000
273@@ -0,0 +1,9 @@
274+python-apt
275+python-gnupginterface
276+dns-server^
277+lamp-server^
278+mail-server^
279+openssh-server^
280+postgresql-server^
281+print-server^
282+samba-server^
283\ No newline at end of file
284
285=== added directory 'AutoUpgradeTester/profile/ubuntu-amd64'
286=== added file 'AutoUpgradeTester/profile/ubuntu-amd64/DistUpgrade.cfg'
287--- AutoUpgradeTester/profile/ubuntu-amd64/DistUpgrade.cfg 1970-01-01 00:00:00 +0000
288+++ AutoUpgradeTester/profile/ubuntu-amd64/DistUpgrade.cfg 2011-12-03 23:51:23 +0000
289@@ -0,0 +1,6 @@
290+[NonInteractive]
291+ProfileName = ubuntu-amd64
292+BasePkg = ubuntu-desktop
293+
294+[KVM]
295+Arch=amd64
296
297=== added symlink 'AutoUpgradeTester/profile/ubuntu-amd64/demoted.cfg'
298=== target is u'../../DistUpgrade/demoted.cfg'
299=== added directory 'AutoUpgradeTester/profile/ubuntu-amd64/result'

Subscribers

People subscribed via source and target branches

to status/vote changes: