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
=== added file 'share/profiles/server-i386/known_hosts'
--- share/profiles/server-i386/known_hosts 1970-01-01 00:00:00 +0000
+++ share/profiles/server-i386/known_hosts 2015-10-08 18:23:26 +0000
@@ -0,0 +1,1 @@
1|1|GFzG7CbsCwHynueZktjg6L+vKo4=|jNwY9KRvumrm0PwQjiwu0o1p8rI= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP2OwzUVHWmGmmy2e1+J2lUMR2m3ftuelenI3NhYttJ+PBEmnZGmyR/8nDUWal/Pn5ZnX88m8tbKnF5ADfXAmkE=
02
=== added file 'share/profiles/trusty/ubuntu-precise-trusty-desktop-amd64/known_hosts'
--- share/profiles/trusty/ubuntu-precise-trusty-desktop-amd64/known_hosts 1970-01-01 00:00:00 +0000
+++ share/profiles/trusty/ubuntu-precise-trusty-desktop-amd64/known_hosts 2015-10-08 18:23:26 +0000
@@ -0,0 +1,1 @@
1|1|4JNr3uw8if5lj1Rj3J3Qo+WGP8s=|UxBdvVs1tGCIw7rxdVcAxM7KY/E= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIxGi+ZSthV4vRjZUBRl+uR8mEmjGq7IEPhkF++TPS3WLsyHVrB1/2pvwU/66My5pNEQyoV8eagp4CCJJcaMVwg=
02
=== added file 'share/profiles/utopic/ubuntu-trusty-utopic-desktop-amd64/known_hosts'
--- share/profiles/utopic/ubuntu-trusty-utopic-desktop-amd64/known_hosts 1970-01-01 00:00:00 +0000
+++ share/profiles/utopic/ubuntu-trusty-utopic-desktop-amd64/known_hosts 2015-10-08 18:23:26 +0000
@@ -0,0 +1,1 @@
1|1|iD0uIgBXDmLwmdUwkYbMncEey6Q=|u4JoyrvrNayTTtoAedjPnjnPjK4= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCHfoTJ/vRF5RP4JVQ63yAiDaE4u0ESU4ImrYDZNq0BH5Yu53dtSQ5T/VQJsUaRycqNqic6AVgcyepXJI45QkMA=
02
=== added file 'share/profiles/vivid/ubuntu-utopic-vivid-server-amd64/known_hosts'
--- share/profiles/vivid/ubuntu-utopic-vivid-server-amd64/known_hosts 1970-01-01 00:00:00 +0000
+++ share/profiles/vivid/ubuntu-utopic-vivid-server-amd64/known_hosts 2015-10-08 18:23:26 +0000
@@ -0,0 +1,3 @@
1|1|1qvyG4BKXblX47xC9diRByrWVL0=|Vk6t2J54HJOOoIJYBa53U+oFvt0= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIZ+0SJqV+0naY3jrAgqCrjx1t69/t7SWx+x6cBURJNV7A5WgP1iMNZ3KVC6RFGNeYN0rDaKgRnq1j1+dIvRbCM=
2|1|uBvW82wD+XC4osZQahnYjPSDmHo=|TsIoON6nOrdgyLcSShdzlPCiK1g= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLLJrq3bjEWGUtQXpUp4X5RjzqBNYgNAKK4h5R7bE55SQBtp4zACO1LXlY7Dlf4y+BDXkWyOs1TgEIYfnQ0w7uo=
3|1|Xp8LOAqpYG6EnhdMp/Nzy5C96BY=|Yp7oSgmmaj3U+wBfT8TxfDhKn9U= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJo+4oBQcXVsTaSgj2YD+T7qWLziPxfaJ4jn3r5ElsWChk7fBiCQoeInh3S6MgYE9+kF658WttcI1FeJQeys6QU=
04
=== added directory 'share/profiles/wily'
=== added directory 'share/profiles/wily/defaults.cfg.d'
=== added file 'share/profiles/wily/defaults.cfg.d/defaults.cfg'
--- share/profiles/wily/defaults.cfg.d/defaults.cfg 1970-01-01 00:00:00 +0000
+++ share/profiles/wily/defaults.cfg.d/defaults.cfg 2015-10-08 18:23:26 +0000
@@ -0,0 +1,64 @@
1# global defaults, override as needed in the indivual configuration
2# files
3#
4[DEFAULT]
5AutoUpgradeTesterBaseDir=/home/upgrade-tester/
6SourceRelease=vivid
7TargetRelease=wily
8
9[Distro]
10BaseMetaPkgs=ubuntu-minimal, ubuntu-standard
11
12[Sources]
13From=%(SourceRelease)s
14To=%(TargetRelease)s
15
16[NonInteractive]
17BasePkg = ubuntu-standard
18Mirror = http://archive.ubuntu.com/ubuntu
19ForceOverwrite=no
20Components=main,restricted
21;Pockets=security,proposed,updates
22Pockets=security,updates
23UpgradeFromDistOnBootstrap=false
24DpkgProgressLog=no
25ResultDir=%(AutoUpgradeTesterBaseDir)s/auto-upgrade-tester/result
26SSHKey=%(AutoUpgradeTesterBaseDir)s/auto-upgrade-tester/ssh-key
27DebugBrokenScripts=yes
28UseUpgraderFromBzr=false
29;AddRepo=local_testing.list
30;AddRepoUpgradeImmediately=true
31;AddRepo=../proposed.%(SourceRelease)s.list
32;Proxy=http://192.168.1.4:8000/
33
34[KVM]
35Virtio=True
36Arch=i386
37ImageDir=%(AutoUpgradeTesterBaseDir)s/auto-upgrade-tester/
38CacheImageDir=%(AutoUpgradeTesterBaseDir)s/auto-upgrade-tester/
39BaseImage=%(ImageDir)s/%(SourceRelease)s-%(Arch)s.qcow2
40CacheBaseImage=yes
41VncNum=1
42SshPort=54322
43
44[LXC]
45LxcPath=/var/lib/lxc
46UseTmpfs=True
47
48[EC2]
49; Ubuntu official images:
50; https://help.ubuntu.com/community/EC2StartersGuide#Getting%20the%20images
51;AMI=ami-44bb5c2d
52; inofficial image
53AMI=ami-0d729464
54SSHKey=./ec2-keypair.pem
55;Specify the security groups you want attached to
56;the instance. For example:
57;SecurityGroups = ssh,web
58; Set this to "yes" if using an Ubuntu official AMI as we need to
59; allow root logins
60;UbuntuOfficialAMI = yes
61
62[CHROOT]
63Tempdir=/tmp/upgrade-tester
64CacheTarball=yes
065
=== added directory 'share/profiles/wily/kubuntu-vivid-wily-desktop-amd64'
=== added file 'share/profiles/wily/kubuntu-vivid-wily-desktop-amd64/DistUpgrade.cfg'
--- share/profiles/wily/kubuntu-vivid-wily-desktop-amd64/DistUpgrade.cfg 1970-01-01 00:00:00 +0000
+++ share/profiles/wily/kubuntu-vivid-wily-desktop-amd64/DistUpgrade.cfg 2015-10-08 18:23:26 +0000
@@ -0,0 +1,11 @@
1[DEFAULT]
2SourceRelease=vivid
3TargetRelease=wily
4
5[NonInteractive]
6ProfileName=kubuntu-vivid-wily-desktop-amd64
7BasePkg = kubuntu-desktop^
8Components=main,universe,restricted
9
10[KVM]
11Arch=amd64
012
=== added directory 'share/profiles/wily/kubuntu-vivid-wily-desktop-i386'
=== added file 'share/profiles/wily/kubuntu-vivid-wily-desktop-i386/DistUpgrade.cfg'
--- share/profiles/wily/kubuntu-vivid-wily-desktop-i386/DistUpgrade.cfg 1970-01-01 00:00:00 +0000
+++ share/profiles/wily/kubuntu-vivid-wily-desktop-i386/DistUpgrade.cfg 2015-10-08 18:23:26 +0000
@@ -0,0 +1,8 @@
1[DEFAULT]
2SourceRelease=vivid
3TargetRelease=wily
4
5[NonInteractive]
6ProfileName=kubuntu-vivid-wily-desktop-i386
7BasePkg = kubuntu-desktop^
8Components=main,universe,restricted
09
=== added directory 'share/profiles/wily/override.cfg.d'
=== added file 'share/profiles/wily/override.cfg.d/global.cfg'
--- share/profiles/wily/override.cfg.d/global.cfg 1970-01-01 00:00:00 +0000
+++ share/profiles/wily/override.cfg.d/global.cfg 2015-10-08 18:23:26 +0000
@@ -0,0 +1,9 @@
1# global override, this will override any configuration from the
2# defaults profile directory and from the release upgrader configuration
3#
4# It is required to force non-interactive upgrade mode but can be used
5# for more too
6
7[View]
8View=DistUpgradeViewNonInteractive
9
010
=== added directory 'share/profiles/wily/ubuntu-vivid-wily-desktop-amd64'
=== added file 'share/profiles/wily/ubuntu-vivid-wily-desktop-amd64/DistUpgrade.cfg'
--- share/profiles/wily/ubuntu-vivid-wily-desktop-amd64/DistUpgrade.cfg 1970-01-01 00:00:00 +0000
+++ share/profiles/wily/ubuntu-vivid-wily-desktop-amd64/DistUpgrade.cfg 2015-10-08 18:23:26 +0000
@@ -0,0 +1,11 @@
1[DEFAULT]
2SourceRelease=vivid
3TargetRelease=wily
4
5[NonInteractive]
6ProfileName=ubuntu-vivid-wily-desktop-amd64
7BasePkg = ubuntu-desktop^
8;AdditionalPkgs = pkgs.cfg
9
10[KVM]
11Arch=amd64
012
=== added file 'share/profiles/wily/ubuntu-vivid-wily-desktop-amd64/known_hosts'
--- share/profiles/wily/ubuntu-vivid-wily-desktop-amd64/known_hosts 1970-01-01 00:00:00 +0000
+++ share/profiles/wily/ubuntu-vivid-wily-desktop-amd64/known_hosts 2015-10-08 18:23:26 +0000
@@ -0,0 +1,1 @@
1|1|VZK+3xeT6jdxxf0kipCb0p0EqZw=|7PW4VYzw/j+XBx8hA6OrJFRRLcc= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJzgpThETroxxwAPMhPHWVv1khL42dvbpegDTZe6L8CkDW96jvHXvanoYH/jC9Xi3A5gyb+GfR5xIwUAKjmAXXI=
02
=== added file 'share/profiles/wily/ubuntu-vivid-wily-desktop-amd64/pkgs.cfg'
=== added directory 'share/profiles/wily/ubuntu-vivid-wily-desktop-amd64/result'
=== added directory 'share/profiles/wily/ubuntu-vivid-wily-desktop-i386'
=== added file 'share/profiles/wily/ubuntu-vivid-wily-desktop-i386/DistUpgrade.cfg'
--- share/profiles/wily/ubuntu-vivid-wily-desktop-i386/DistUpgrade.cfg 1970-01-01 00:00:00 +0000
+++ share/profiles/wily/ubuntu-vivid-wily-desktop-i386/DistUpgrade.cfg 2015-10-08 18:23:26 +0000
@@ -0,0 +1,8 @@
1[DEFAULT]
2SourceRelease=vivid
3TargetRelease=wily
4
5[NonInteractive]
6ProfileName=ubuntu-vivid-wily-desktop-i386
7BasePkg = ubuntu-desktop^
8;AdditionalPkgs = pkgs.cfg
09
=== added file 'share/profiles/wily/ubuntu-vivid-wily-desktop-i386/pkgs.cfg'
=== added directory 'share/profiles/wily/ubuntu-vivid-wily-desktop-i386/result'
=== added directory 'share/profiles/wily/ubuntu-vivid-wily-server-amd64'
=== added file 'share/profiles/wily/ubuntu-vivid-wily-server-amd64/DistUpgrade.cfg'
--- share/profiles/wily/ubuntu-vivid-wily-server-amd64/DistUpgrade.cfg 1970-01-01 00:00:00 +0000
+++ share/profiles/wily/ubuntu-vivid-wily-server-amd64/DistUpgrade.cfg 2015-10-08 18:23:26 +0000
@@ -0,0 +1,11 @@
1[DEFAULT]
2SourceRelease=vivid
3TargetRelease=wily
4
5[NonInteractive]
6ProfileName=ubuntu-vivid-wily-server-amd64
7AdditionalPkgs = pkgs.cfg
8
9[KVM]
10Arch=amd64
11
012
=== added file 'share/profiles/wily/ubuntu-vivid-wily-server-amd64/pkgs.cfg'
--- share/profiles/wily/ubuntu-vivid-wily-server-amd64/pkgs.cfg 1970-01-01 00:00:00 +0000
+++ share/profiles/wily/ubuntu-vivid-wily-server-amd64/pkgs.cfg 2015-10-08 18:23:26 +0000
@@ -0,0 +1,2 @@
1python-apt
2server^
03
=== added directory 'share/profiles/wily/ubuntu-vivid-wily-server-i386'
=== added file 'share/profiles/wily/ubuntu-vivid-wily-server-i386/DistUpgrade.cfg'
--- share/profiles/wily/ubuntu-vivid-wily-server-i386/DistUpgrade.cfg 1970-01-01 00:00:00 +0000
+++ share/profiles/wily/ubuntu-vivid-wily-server-i386/DistUpgrade.cfg 2015-10-08 18:23:26 +0000
@@ -0,0 +1,11 @@
1[DEFAULT]
2SourceRelease=vivid
3TargetRelease=wily
4
5[NonInteractive]
6ProfileName=ubuntu-vivid-wily-server-i386
7AdditionalPkgs = pkgs.cfg
8
9[KVM]
10Arch=i386
11
012
=== added file 'share/profiles/wily/ubuntu-vivid-wily-server-i386/pkgs.cfg'
--- share/profiles/wily/ubuntu-vivid-wily-server-i386/pkgs.cfg 1970-01-01 00:00:00 +0000
+++ share/profiles/wily/ubuntu-vivid-wily-server-i386/pkgs.cfg 2015-10-08 18:23:26 +0000
@@ -0,0 +1,2 @@
1python-apt
2server^
03
=== added directory 'share/profiles/wily/ubuntu-vivid-wily-server-tasks-amd64'
=== added file 'share/profiles/wily/ubuntu-vivid-wily-server-tasks-amd64/DistUpgrade.cfg'
--- share/profiles/wily/ubuntu-vivid-wily-server-tasks-amd64/DistUpgrade.cfg 1970-01-01 00:00:00 +0000
+++ share/profiles/wily/ubuntu-vivid-wily-server-tasks-amd64/DistUpgrade.cfg 2015-10-08 18:23:26 +0000
@@ -0,0 +1,11 @@
1[DEFAULT]
2SourceRelease=vivid
3TargetRelease=wily
4
5[NonInteractive]
6ProfileName=ubuntu-vivid-wily-server-tasks-amd64
7AdditionalPkgs = pkgs.cfg
8Components=main,universe
9
10[KVM]
11Arch=amd64
012
=== added file 'share/profiles/wily/ubuntu-vivid-wily-server-tasks-amd64/pkgs.cfg'
--- share/profiles/wily/ubuntu-vivid-wily-server-tasks-amd64/pkgs.cfg 1970-01-01 00:00:00 +0000
+++ share/profiles/wily/ubuntu-vivid-wily-server-tasks-amd64/pkgs.cfg 2015-10-08 18:23:26 +0000
@@ -0,0 +1,10 @@
1python-apt
2python-gnupginterface
3dns-server^
4lamp-server^
5mail-server^
6openssh-server^
7postgresql-server^
8print-server^
9samba-server^
10server^
011
=== added directory 'share/profiles/wily/ubuntu-vivid-wily-server-tasks-i386'
=== added file 'share/profiles/wily/ubuntu-vivid-wily-server-tasks-i386/DistUpgrade.cfg'
--- share/profiles/wily/ubuntu-vivid-wily-server-tasks-i386/DistUpgrade.cfg 1970-01-01 00:00:00 +0000
+++ share/profiles/wily/ubuntu-vivid-wily-server-tasks-i386/DistUpgrade.cfg 2015-10-08 18:23:26 +0000
@@ -0,0 +1,8 @@
1[DEFAULT]
2SourceRelease=vivid
3TargetRelease=wily
4
5[NonInteractive]
6ProfileName=ubuntu-vivid-wily-server-tasks-i386
7AdditionalPkgs = pkgs.cfg
8Components=main,universe
09
=== added file 'share/profiles/wily/ubuntu-vivid-wily-server-tasks-i386/pkgs.cfg'
--- share/profiles/wily/ubuntu-vivid-wily-server-tasks-i386/pkgs.cfg 1970-01-01 00:00:00 +0000
+++ share/profiles/wily/ubuntu-vivid-wily-server-tasks-i386/pkgs.cfg 2015-10-08 18:23:26 +0000
@@ -0,0 +1,10 @@
1python-apt
2python-gnupginterface
3dns-server^
4lamp-server^
5mail-server^
6openssh-server^
7postgresql-server^
8print-server^
9samba-server^
10server^

Subscribers

People subscribed via source and target branches