Merge lp:~canonical-platform-qa/vmbuilder/v-w into lp:vmbuilder

Proposed by Max Brustkern
Status: Merged
Merged at revision: 490
Proposed branch: lp:~canonical-platform-qa/vmbuilder/v-w
Merge into: lp:vmbuilder
Diff against target: 106 lines (+73/-2)
4 files modified
VMBuilder/plugins/ubuntu/distro.py (+4/-2)
VMBuilder/plugins/ubuntu/utopic.py (+23/-0)
VMBuilder/plugins/ubuntu/vivid.py (+23/-0)
VMBuilder/plugins/ubuntu/wily.py (+23/-0)
To merge this branch: bzr merge lp:~canonical-platform-qa/vmbuilder/v-w
Reviewer Review Type Date Requested Status
Serge Hallyn Approve
Review via email: mp+273685@code.launchpad.net

Description of the change

This branch adds support for utopic, vivid, and wily.

To post a comment you must log in.
491. By Max Brustkern

Corrected imports

Revision history for this message
Serge Hallyn (serge-hallyn) wrote :

Thanks, looks good.

review: Approve
Revision history for this message
Serge Hallyn (serge-hallyn) wrote :

Thanks, Max, please ping me in #server if you'd like this in the archive.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'VMBuilder/plugins/ubuntu/distro.py'
2--- VMBuilder/plugins/ubuntu/distro.py 2014-03-04 22:33:28 +0000
3+++ VMBuilder/plugins/ubuntu/distro.py 2015-10-07 13:16:27 +0000
4@@ -1,6 +1,6 @@
5 #
6 # Uncomplicated VM Builder
7-# Copyright (C) 2007-2010 Canonical Ltd.
8+# Copyright (C) 2007-2015 Canonical Ltd.
9 #
10 # See AUTHORS for list of contributors
11 #
12@@ -30,7 +30,9 @@
13 arg = 'ubuntu'
14 suites = ['dapper', 'gutsy', 'hardy', 'intrepid', 'jaunty',
15 'karmic', 'lucid', 'maverick', 'natty', 'oneiric',
16- 'precise', 'quantal', 'raring', 'saucy', 'trusty' ]
17+ 'precise', 'quantal', 'raring', 'saucy', 'trusty',
18+ 'utopic', 'vivid', 'wily',
19+ ]
20
21 # Maps host arch to valid guest archs
22 valid_archs = { 'amd64' : ['amd64', 'i386', 'lpia' ],
23
24=== added file 'VMBuilder/plugins/ubuntu/utopic.py'
25--- VMBuilder/plugins/ubuntu/utopic.py 1970-01-01 00:00:00 +0000
26+++ VMBuilder/plugins/ubuntu/utopic.py 2015-10-07 13:16:27 +0000
27@@ -0,0 +1,23 @@
28+#
29+# Uncomplicated VM Builder
30+# Copyright (C) 2010-2015 Canonical Ltd.
31+#
32+# See AUTHORS for list of contributors
33+#
34+# This program is free software: you can redistribute it and/or modify
35+# it under the terms of the GNU General Public License version 3, as
36+# published by the Free Software Foundation.
37+#
38+# This program is distributed in the hope that it will be useful,
39+# but WITHOUT ANY WARRANTY; without even the implied warranty of
40+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
41+# GNU General Public License for more details.
42+#
43+# You should have received a copy of the GNU General Public License
44+# along with this program. If not, see <http://www.gnu.org/licenses/>.
45+#
46+import time
47+from VMBuilder.plugins.ubuntu.trusty import Trusty
48+
49+class Utopic(Trusty):
50+ pass
51
52=== added file 'VMBuilder/plugins/ubuntu/vivid.py'
53--- VMBuilder/plugins/ubuntu/vivid.py 1970-01-01 00:00:00 +0000
54+++ VMBuilder/plugins/ubuntu/vivid.py 2015-10-07 13:16:27 +0000
55@@ -0,0 +1,23 @@
56+#
57+# Uncomplicated VM Builder
58+# Copyright (C) 2010-2015 Canonical Ltd.
59+#
60+# See AUTHORS for list of contributors
61+#
62+# This program is free software: you can redistribute it and/or modify
63+# it under the terms of the GNU General Public License version 3, as
64+# published by the Free Software Foundation.
65+#
66+# This program is distributed in the hope that it will be useful,
67+# but WITHOUT ANY WARRANTY; without even the implied warranty of
68+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
69+# GNU General Public License for more details.
70+#
71+# You should have received a copy of the GNU General Public License
72+# along with this program. If not, see <http://www.gnu.org/licenses/>.
73+#
74+import time
75+from VMBuilder.plugins.ubuntu.utopic import Utopic
76+
77+class Vivid(Utopic):
78+ pass
79
80=== added file 'VMBuilder/plugins/ubuntu/wily.py'
81--- VMBuilder/plugins/ubuntu/wily.py 1970-01-01 00:00:00 +0000
82+++ VMBuilder/plugins/ubuntu/wily.py 2015-10-07 13:16:27 +0000
83@@ -0,0 +1,23 @@
84+#
85+# Uncomplicated VM Builder
86+# Copyright (C) 2010-2015 Canonical Ltd.
87+#
88+# See AUTHORS for list of contributors
89+#
90+# This program is free software: you can redistribute it and/or modify
91+# it under the terms of the GNU General Public License version 3, as
92+# published by the Free Software Foundation.
93+#
94+# This program is distributed in the hope that it will be useful,
95+# but WITHOUT ANY WARRANTY; without even the implied warranty of
96+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
97+# GNU General Public License for more details.
98+#
99+# You should have received a copy of the GNU General Public License
100+# along with this program. If not, see <http://www.gnu.org/licenses/>.
101+#
102+import time
103+from VMBuilder.plugins.ubuntu.vivid import Vivid
104+
105+class Wily(Vivid):
106+ pass

Subscribers

People subscribed via source and target branches