← Back to team overview

vmbuilder team mailing list archive

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

 

Max Brustkern has proposed merging lp:~canonical-platform-qa/vmbuilder/v-w into lp:vmbuilder.

Requested reviews:
  VMBuilder (vmbuilder)

For more details, see:
https://code.launchpad.net/~canonical-platform-qa/vmbuilder/v-w/+merge/273685

This branch adds support for utopic, vivid, and wily.
-- 
Your team VMBuilder is requested to review the proposed merge of lp:~canonical-platform-qa/vmbuilder/v-w into lp:vmbuilder.
=== modified file 'VMBuilder/plugins/ubuntu/distro.py'
--- VMBuilder/plugins/ubuntu/distro.py	2014-03-04 22:33:28 +0000
+++ VMBuilder/plugins/ubuntu/distro.py	2015-10-07 12:58:05 +0000
@@ -1,6 +1,6 @@
 #
 #    Uncomplicated VM Builder
-#    Copyright (C) 2007-2010 Canonical Ltd.
+#    Copyright (C) 2007-2015 Canonical Ltd.
 #
 #    See AUTHORS for list of contributors
 #
@@ -30,7 +30,9 @@
     arg = 'ubuntu'
     suites = ['dapper', 'gutsy', 'hardy', 'intrepid', 'jaunty', 
               'karmic', 'lucid', 'maverick', 'natty', 'oneiric',
-              'precise', 'quantal', 'raring', 'saucy', 'trusty' ]
+              'precise', 'quantal', 'raring', 'saucy', 'trusty',
+              'utopic', 'vivid', 'wily',
+             ]
 
     # Maps host arch to valid guest archs
     valid_archs = { 'amd64' : ['amd64', 'i386', 'lpia' ],

=== added file 'VMBuilder/plugins/ubuntu/utopic.py'
--- VMBuilder/plugins/ubuntu/utopic.py	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/ubuntu/utopic.py	2015-10-07 12:58:05 +0000
@@ -0,0 +1,23 @@
+#
+#    Uncomplicated VM Builder
+#    Copyright (C) 2010-2015 Canonical Ltd.
+#
+#    See AUTHORS for list of contributors
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License version 3, as
+#    published by the Free Software Foundation.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+import time
+from VMBuilder.plugins.ubuntu.saucy import Trusty
+
+class Utopic(Trusty):
+    pass

=== added file 'VMBuilder/plugins/ubuntu/vivid.py'
--- VMBuilder/plugins/ubuntu/vivid.py	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/ubuntu/vivid.py	2015-10-07 12:58:05 +0000
@@ -0,0 +1,23 @@
+#
+#    Uncomplicated VM Builder
+#    Copyright (C) 2010-2015 Canonical Ltd.
+#
+#    See AUTHORS for list of contributors
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License version 3, as
+#    published by the Free Software Foundation.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+import time
+from VMBuilder.plugins.ubuntu.saucy import Utopic
+
+class Vivid(Utopic):
+    pass

=== added file 'VMBuilder/plugins/ubuntu/wily.py'
--- VMBuilder/plugins/ubuntu/wily.py	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/ubuntu/wily.py	2015-10-07 12:58:05 +0000
@@ -0,0 +1,23 @@
+#
+#    Uncomplicated VM Builder
+#    Copyright (C) 2010-2015 Canonical Ltd.
+#
+#    See AUTHORS for list of contributors
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License version 3, as
+#    published by the Free Software Foundation.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+import time
+from VMBuilder.plugins.ubuntu.saucy import Vivid
+
+class Wily(Vivid):
+    pass