Merge lp:~canonical-platform-qa/auto-upgrade-testing/wily into lp:~auto-upgrade-testing-dev/auto-upgrade-testing/trunk

Proposed by Max Brustkern
Status: Rejected
Rejected by: Max Brustkern
Proposed branch: lp:~canonical-platform-qa/auto-upgrade-testing/wily
Merge into: lp:~auto-upgrade-testing-dev/auto-upgrade-testing/trunk
Diff against target: 292 lines (+183/-0)
19 files modified
share/profiles/server-i386/known_hosts (+1/-0)
share/profiles/trusty/ubuntu-precise-trusty-desktop-amd64/known_hosts (+1/-0)
share/profiles/utopic/ubuntu-trusty-utopic-desktop-amd64/known_hosts (+1/-0)
share/profiles/vivid/ubuntu-utopic-vivid-server-amd64/known_hosts (+3/-0)
share/profiles/wily/defaults.cfg.d/defaults.cfg (+64/-0)
share/profiles/wily/kubuntu-vivid-wily-desktop-amd64/DistUpgrade.cfg (+11/-0)
share/profiles/wily/kubuntu-vivid-wily-desktop-i386/DistUpgrade.cfg (+8/-0)
share/profiles/wily/override.cfg.d/global.cfg (+9/-0)
share/profiles/wily/ubuntu-vivid-wily-desktop-amd64/DistUpgrade.cfg (+11/-0)
share/profiles/wily/ubuntu-vivid-wily-desktop-amd64/known_hosts (+1/-0)
share/profiles/wily/ubuntu-vivid-wily-desktop-i386/DistUpgrade.cfg (+8/-0)
share/profiles/wily/ubuntu-vivid-wily-server-amd64/DistUpgrade.cfg (+11/-0)
share/profiles/wily/ubuntu-vivid-wily-server-amd64/pkgs.cfg (+2/-0)
share/profiles/wily/ubuntu-vivid-wily-server-i386/DistUpgrade.cfg (+11/-0)
share/profiles/wily/ubuntu-vivid-wily-server-i386/pkgs.cfg (+2/-0)
share/profiles/wily/ubuntu-vivid-wily-server-tasks-amd64/DistUpgrade.cfg (+11/-0)
share/profiles/wily/ubuntu-vivid-wily-server-tasks-amd64/pkgs.cfg (+10/-0)
share/profiles/wily/ubuntu-vivid-wily-server-tasks-i386/DistUpgrade.cfg (+8/-0)
share/profiles/wily/ubuntu-vivid-wily-server-tasks-i386/pkgs.cfg (+10/-0)
To merge this branch: bzr merge lp:~canonical-platform-qa/auto-upgrade-testing/wily
Reviewer Review Type Date Requested Status
Auto Upgrade Testing Developers Pending
Review via email: mp+273897@code.launchpad.net

Description of the change

This branch adds profiles for wily based on the vivid profiles.

To post a comment you must log in.

Unmerged revisions

128. By Max Brustkern

Added wily

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'share/profiles/server-i386/known_hosts'
2--- share/profiles/server-i386/known_hosts 1970-01-01 00:00:00 +0000
3+++ share/profiles/server-i386/known_hosts 2015-10-08 18:23:26 +0000
4@@ -0,0 +1,1 @@
5+|1|GFzG7CbsCwHynueZktjg6L+vKo4=|jNwY9KRvumrm0PwQjiwu0o1p8rI= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP2OwzUVHWmGmmy2e1+J2lUMR2m3ftuelenI3NhYttJ+PBEmnZGmyR/8nDUWal/Pn5ZnX88m8tbKnF5ADfXAmkE=
6
7=== added file 'share/profiles/trusty/ubuntu-precise-trusty-desktop-amd64/known_hosts'
8--- share/profiles/trusty/ubuntu-precise-trusty-desktop-amd64/known_hosts 1970-01-01 00:00:00 +0000
9+++ share/profiles/trusty/ubuntu-precise-trusty-desktop-amd64/known_hosts 2015-10-08 18:23:26 +0000
10@@ -0,0 +1,1 @@
11+|1|4JNr3uw8if5lj1Rj3J3Qo+WGP8s=|UxBdvVs1tGCIw7rxdVcAxM7KY/E= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIxGi+ZSthV4vRjZUBRl+uR8mEmjGq7IEPhkF++TPS3WLsyHVrB1/2pvwU/66My5pNEQyoV8eagp4CCJJcaMVwg=
12
13=== added file 'share/profiles/utopic/ubuntu-trusty-utopic-desktop-amd64/known_hosts'
14--- share/profiles/utopic/ubuntu-trusty-utopic-desktop-amd64/known_hosts 1970-01-01 00:00:00 +0000
15+++ share/profiles/utopic/ubuntu-trusty-utopic-desktop-amd64/known_hosts 2015-10-08 18:23:26 +0000
16@@ -0,0 +1,1 @@
17+|1|iD0uIgBXDmLwmdUwkYbMncEey6Q=|u4JoyrvrNayTTtoAedjPnjnPjK4= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCHfoTJ/vRF5RP4JVQ63yAiDaE4u0ESU4ImrYDZNq0BH5Yu53dtSQ5T/VQJsUaRycqNqic6AVgcyepXJI45QkMA=
18
19=== added file 'share/profiles/vivid/ubuntu-utopic-vivid-server-amd64/known_hosts'
20--- share/profiles/vivid/ubuntu-utopic-vivid-server-amd64/known_hosts 1970-01-01 00:00:00 +0000
21+++ share/profiles/vivid/ubuntu-utopic-vivid-server-amd64/known_hosts 2015-10-08 18:23:26 +0000
22@@ -0,0 +1,3 @@
23+|1|1qvyG4BKXblX47xC9diRByrWVL0=|Vk6t2J54HJOOoIJYBa53U+oFvt0= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIZ+0SJqV+0naY3jrAgqCrjx1t69/t7SWx+x6cBURJNV7A5WgP1iMNZ3KVC6RFGNeYN0rDaKgRnq1j1+dIvRbCM=
24+|1|uBvW82wD+XC4osZQahnYjPSDmHo=|TsIoON6nOrdgyLcSShdzlPCiK1g= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLLJrq3bjEWGUtQXpUp4X5RjzqBNYgNAKK4h5R7bE55SQBtp4zACO1LXlY7Dlf4y+BDXkWyOs1TgEIYfnQ0w7uo=
25+|1|Xp8LOAqpYG6EnhdMp/Nzy5C96BY=|Yp7oSgmmaj3U+wBfT8TxfDhKn9U= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJo+4oBQcXVsTaSgj2YD+T7qWLziPxfaJ4jn3r5ElsWChk7fBiCQoeInh3S6MgYE9+kF658WttcI1FeJQeys6QU=
26
27=== added directory 'share/profiles/wily'
28=== added directory 'share/profiles/wily/defaults.cfg.d'
29=== added file 'share/profiles/wily/defaults.cfg.d/defaults.cfg'
30--- share/profiles/wily/defaults.cfg.d/defaults.cfg 1970-01-01 00:00:00 +0000
31+++ share/profiles/wily/defaults.cfg.d/defaults.cfg 2015-10-08 18:23:26 +0000
32@@ -0,0 +1,64 @@
33+# global defaults, override as needed in the indivual configuration
34+# files
35+#
36+[DEFAULT]
37+AutoUpgradeTesterBaseDir=/home/upgrade-tester/
38+SourceRelease=vivid
39+TargetRelease=wily
40+
41+[Distro]
42+BaseMetaPkgs=ubuntu-minimal, ubuntu-standard
43+
44+[Sources]
45+From=%(SourceRelease)s
46+To=%(TargetRelease)s
47+
48+[NonInteractive]
49+BasePkg = ubuntu-standard
50+Mirror = http://archive.ubuntu.com/ubuntu
51+ForceOverwrite=no
52+Components=main,restricted
53+;Pockets=security,proposed,updates
54+Pockets=security,updates
55+UpgradeFromDistOnBootstrap=false
56+DpkgProgressLog=no
57+ResultDir=%(AutoUpgradeTesterBaseDir)s/auto-upgrade-tester/result
58+SSHKey=%(AutoUpgradeTesterBaseDir)s/auto-upgrade-tester/ssh-key
59+DebugBrokenScripts=yes
60+UseUpgraderFromBzr=false
61+;AddRepo=local_testing.list
62+;AddRepoUpgradeImmediately=true
63+;AddRepo=../proposed.%(SourceRelease)s.list
64+;Proxy=http://192.168.1.4:8000/
65+
66+[KVM]
67+Virtio=True
68+Arch=i386
69+ImageDir=%(AutoUpgradeTesterBaseDir)s/auto-upgrade-tester/
70+CacheImageDir=%(AutoUpgradeTesterBaseDir)s/auto-upgrade-tester/
71+BaseImage=%(ImageDir)s/%(SourceRelease)s-%(Arch)s.qcow2
72+CacheBaseImage=yes
73+VncNum=1
74+SshPort=54322
75+
76+[LXC]
77+LxcPath=/var/lib/lxc
78+UseTmpfs=True
79+
80+[EC2]
81+; Ubuntu official images:
82+; https://help.ubuntu.com/community/EC2StartersGuide#Getting%20the%20images
83+;AMI=ami-44bb5c2d
84+; inofficial image
85+AMI=ami-0d729464
86+SSHKey=./ec2-keypair.pem
87+;Specify the security groups you want attached to
88+;the instance. For example:
89+;SecurityGroups = ssh,web
90+; Set this to "yes" if using an Ubuntu official AMI as we need to
91+; allow root logins
92+;UbuntuOfficialAMI = yes
93+
94+[CHROOT]
95+Tempdir=/tmp/upgrade-tester
96+CacheTarball=yes
97
98=== added directory 'share/profiles/wily/kubuntu-vivid-wily-desktop-amd64'
99=== added file 'share/profiles/wily/kubuntu-vivid-wily-desktop-amd64/DistUpgrade.cfg'
100--- share/profiles/wily/kubuntu-vivid-wily-desktop-amd64/DistUpgrade.cfg 1970-01-01 00:00:00 +0000
101+++ share/profiles/wily/kubuntu-vivid-wily-desktop-amd64/DistUpgrade.cfg 2015-10-08 18:23:26 +0000
102@@ -0,0 +1,11 @@
103+[DEFAULT]
104+SourceRelease=vivid
105+TargetRelease=wily
106+
107+[NonInteractive]
108+ProfileName=kubuntu-vivid-wily-desktop-amd64
109+BasePkg = kubuntu-desktop^
110+Components=main,universe,restricted
111+
112+[KVM]
113+Arch=amd64
114
115=== added directory 'share/profiles/wily/kubuntu-vivid-wily-desktop-i386'
116=== added file 'share/profiles/wily/kubuntu-vivid-wily-desktop-i386/DistUpgrade.cfg'
117--- share/profiles/wily/kubuntu-vivid-wily-desktop-i386/DistUpgrade.cfg 1970-01-01 00:00:00 +0000
118+++ share/profiles/wily/kubuntu-vivid-wily-desktop-i386/DistUpgrade.cfg 2015-10-08 18:23:26 +0000
119@@ -0,0 +1,8 @@
120+[DEFAULT]
121+SourceRelease=vivid
122+TargetRelease=wily
123+
124+[NonInteractive]
125+ProfileName=kubuntu-vivid-wily-desktop-i386
126+BasePkg = kubuntu-desktop^
127+Components=main,universe,restricted
128
129=== added directory 'share/profiles/wily/override.cfg.d'
130=== added file 'share/profiles/wily/override.cfg.d/global.cfg'
131--- share/profiles/wily/override.cfg.d/global.cfg 1970-01-01 00:00:00 +0000
132+++ share/profiles/wily/override.cfg.d/global.cfg 2015-10-08 18:23:26 +0000
133@@ -0,0 +1,9 @@
134+# global override, this will override any configuration from the
135+# defaults profile directory and from the release upgrader configuration
136+#
137+# It is required to force non-interactive upgrade mode but can be used
138+# for more too
139+
140+[View]
141+View=DistUpgradeViewNonInteractive
142+
143
144=== added directory 'share/profiles/wily/ubuntu-vivid-wily-desktop-amd64'
145=== added file 'share/profiles/wily/ubuntu-vivid-wily-desktop-amd64/DistUpgrade.cfg'
146--- share/profiles/wily/ubuntu-vivid-wily-desktop-amd64/DistUpgrade.cfg 1970-01-01 00:00:00 +0000
147+++ share/profiles/wily/ubuntu-vivid-wily-desktop-amd64/DistUpgrade.cfg 2015-10-08 18:23:26 +0000
148@@ -0,0 +1,11 @@
149+[DEFAULT]
150+SourceRelease=vivid
151+TargetRelease=wily
152+
153+[NonInteractive]
154+ProfileName=ubuntu-vivid-wily-desktop-amd64
155+BasePkg = ubuntu-desktop^
156+;AdditionalPkgs = pkgs.cfg
157+
158+[KVM]
159+Arch=amd64
160
161=== added file 'share/profiles/wily/ubuntu-vivid-wily-desktop-amd64/known_hosts'
162--- share/profiles/wily/ubuntu-vivid-wily-desktop-amd64/known_hosts 1970-01-01 00:00:00 +0000
163+++ share/profiles/wily/ubuntu-vivid-wily-desktop-amd64/known_hosts 2015-10-08 18:23:26 +0000
164@@ -0,0 +1,1 @@
165+|1|VZK+3xeT6jdxxf0kipCb0p0EqZw=|7PW4VYzw/j+XBx8hA6OrJFRRLcc= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJzgpThETroxxwAPMhPHWVv1khL42dvbpegDTZe6L8CkDW96jvHXvanoYH/jC9Xi3A5gyb+GfR5xIwUAKjmAXXI=
166
167=== added file 'share/profiles/wily/ubuntu-vivid-wily-desktop-amd64/pkgs.cfg'
168=== added directory 'share/profiles/wily/ubuntu-vivid-wily-desktop-amd64/result'
169=== added directory 'share/profiles/wily/ubuntu-vivid-wily-desktop-i386'
170=== added file 'share/profiles/wily/ubuntu-vivid-wily-desktop-i386/DistUpgrade.cfg'
171--- share/profiles/wily/ubuntu-vivid-wily-desktop-i386/DistUpgrade.cfg 1970-01-01 00:00:00 +0000
172+++ share/profiles/wily/ubuntu-vivid-wily-desktop-i386/DistUpgrade.cfg 2015-10-08 18:23:26 +0000
173@@ -0,0 +1,8 @@
174+[DEFAULT]
175+SourceRelease=vivid
176+TargetRelease=wily
177+
178+[NonInteractive]
179+ProfileName=ubuntu-vivid-wily-desktop-i386
180+BasePkg = ubuntu-desktop^
181+;AdditionalPkgs = pkgs.cfg
182
183=== added file 'share/profiles/wily/ubuntu-vivid-wily-desktop-i386/pkgs.cfg'
184=== added directory 'share/profiles/wily/ubuntu-vivid-wily-desktop-i386/result'
185=== added directory 'share/profiles/wily/ubuntu-vivid-wily-server-amd64'
186=== added file 'share/profiles/wily/ubuntu-vivid-wily-server-amd64/DistUpgrade.cfg'
187--- share/profiles/wily/ubuntu-vivid-wily-server-amd64/DistUpgrade.cfg 1970-01-01 00:00:00 +0000
188+++ share/profiles/wily/ubuntu-vivid-wily-server-amd64/DistUpgrade.cfg 2015-10-08 18:23:26 +0000
189@@ -0,0 +1,11 @@
190+[DEFAULT]
191+SourceRelease=vivid
192+TargetRelease=wily
193+
194+[NonInteractive]
195+ProfileName=ubuntu-vivid-wily-server-amd64
196+AdditionalPkgs = pkgs.cfg
197+
198+[KVM]
199+Arch=amd64
200+
201
202=== added file 'share/profiles/wily/ubuntu-vivid-wily-server-amd64/pkgs.cfg'
203--- share/profiles/wily/ubuntu-vivid-wily-server-amd64/pkgs.cfg 1970-01-01 00:00:00 +0000
204+++ share/profiles/wily/ubuntu-vivid-wily-server-amd64/pkgs.cfg 2015-10-08 18:23:26 +0000
205@@ -0,0 +1,2 @@
206+python-apt
207+server^
208
209=== added directory 'share/profiles/wily/ubuntu-vivid-wily-server-i386'
210=== added file 'share/profiles/wily/ubuntu-vivid-wily-server-i386/DistUpgrade.cfg'
211--- share/profiles/wily/ubuntu-vivid-wily-server-i386/DistUpgrade.cfg 1970-01-01 00:00:00 +0000
212+++ share/profiles/wily/ubuntu-vivid-wily-server-i386/DistUpgrade.cfg 2015-10-08 18:23:26 +0000
213@@ -0,0 +1,11 @@
214+[DEFAULT]
215+SourceRelease=vivid
216+TargetRelease=wily
217+
218+[NonInteractive]
219+ProfileName=ubuntu-vivid-wily-server-i386
220+AdditionalPkgs = pkgs.cfg
221+
222+[KVM]
223+Arch=i386
224+
225
226=== added file 'share/profiles/wily/ubuntu-vivid-wily-server-i386/pkgs.cfg'
227--- share/profiles/wily/ubuntu-vivid-wily-server-i386/pkgs.cfg 1970-01-01 00:00:00 +0000
228+++ share/profiles/wily/ubuntu-vivid-wily-server-i386/pkgs.cfg 2015-10-08 18:23:26 +0000
229@@ -0,0 +1,2 @@
230+python-apt
231+server^
232
233=== added directory 'share/profiles/wily/ubuntu-vivid-wily-server-tasks-amd64'
234=== added file 'share/profiles/wily/ubuntu-vivid-wily-server-tasks-amd64/DistUpgrade.cfg'
235--- share/profiles/wily/ubuntu-vivid-wily-server-tasks-amd64/DistUpgrade.cfg 1970-01-01 00:00:00 +0000
236+++ share/profiles/wily/ubuntu-vivid-wily-server-tasks-amd64/DistUpgrade.cfg 2015-10-08 18:23:26 +0000
237@@ -0,0 +1,11 @@
238+[DEFAULT]
239+SourceRelease=vivid
240+TargetRelease=wily
241+
242+[NonInteractive]
243+ProfileName=ubuntu-vivid-wily-server-tasks-amd64
244+AdditionalPkgs = pkgs.cfg
245+Components=main,universe
246+
247+[KVM]
248+Arch=amd64
249
250=== added file 'share/profiles/wily/ubuntu-vivid-wily-server-tasks-amd64/pkgs.cfg'
251--- share/profiles/wily/ubuntu-vivid-wily-server-tasks-amd64/pkgs.cfg 1970-01-01 00:00:00 +0000
252+++ share/profiles/wily/ubuntu-vivid-wily-server-tasks-amd64/pkgs.cfg 2015-10-08 18:23:26 +0000
253@@ -0,0 +1,10 @@
254+python-apt
255+python-gnupginterface
256+dns-server^
257+lamp-server^
258+mail-server^
259+openssh-server^
260+postgresql-server^
261+print-server^
262+samba-server^
263+server^
264
265=== added directory 'share/profiles/wily/ubuntu-vivid-wily-server-tasks-i386'
266=== added file 'share/profiles/wily/ubuntu-vivid-wily-server-tasks-i386/DistUpgrade.cfg'
267--- share/profiles/wily/ubuntu-vivid-wily-server-tasks-i386/DistUpgrade.cfg 1970-01-01 00:00:00 +0000
268+++ share/profiles/wily/ubuntu-vivid-wily-server-tasks-i386/DistUpgrade.cfg 2015-10-08 18:23:26 +0000
269@@ -0,0 +1,8 @@
270+[DEFAULT]
271+SourceRelease=vivid
272+TargetRelease=wily
273+
274+[NonInteractive]
275+ProfileName=ubuntu-vivid-wily-server-tasks-i386
276+AdditionalPkgs = pkgs.cfg
277+Components=main,universe
278
279=== added file 'share/profiles/wily/ubuntu-vivid-wily-server-tasks-i386/pkgs.cfg'
280--- share/profiles/wily/ubuntu-vivid-wily-server-tasks-i386/pkgs.cfg 1970-01-01 00:00:00 +0000
281+++ share/profiles/wily/ubuntu-vivid-wily-server-tasks-i386/pkgs.cfg 2015-10-08 18:23:26 +0000
282@@ -0,0 +1,10 @@
283+python-apt
284+python-gnupginterface
285+dns-server^
286+lamp-server^
287+mail-server^
288+openssh-server^
289+postgresql-server^
290+print-server^
291+samba-server^
292+server^

Subscribers

People subscribed via source and target branches