Ubuntu 12.04 is out, so add a vagrant config for it.

Replace the 11.04 config, but keep 10.04 to cover the two LTS releases.

diff --git a/maint/vm/ubuntu11.04/Vagrantfile b/maint/vm/ubuntu12.04/Vagrantfile
similarity index 67%
rename from maint/vm/ubuntu11.04/Vagrantfile
rename to maint/vm/ubuntu12.04/Vagrantfile
index 79b70ee5bf2fbfcffb2a6a4ac9aaf86025a5bc2c..9fcc82a2c7eb7f7ffb74ba8ac0f09ce2595cf112 100644 (file)
--- a/maint/vm/ubuntu11.04/Vagrantfile
+++ b/maint/vm/ubuntu12.04/Vagrantfile
@@ -1,7 +1,7 @@
 Vagrant::Config.run do |config|
-    config.vm.box = "ubuntu11.04"
+    config.vm.box = "ubuntu12.04"
 
-    config.vm.network :hostonly, "172.19.1.4"
+    config.vm.network :hostonly, "172.19.1.5"
     config.vm.share_folder("tornado", "/tornado", "../../..", :nfs=> true)
 
     config.vm.provision :shell, :path => "setup.sh"

diff --git a/maint/vm/ubuntu11.04/setup.sh b/maint/vm/ubuntu12.04/setup.sh
similarity index 72%
rename from maint/vm/ubuntu11.04/setup.sh
rename to maint/vm/ubuntu12.04/setup.sh
index d5a30f6543d9bf13f937747dddd96e836538265e..67119e6007ba912287ef467cdf9af858e421edce 100644 (file)
--- a/maint/vm/ubuntu11.04/setup.sh
+++ b/maint/vm/ubuntu12.04/setup.sh
@@ -2,12 +2,6 @@
 
 set -e
 
-# Ubuntu 10.10+ do some extra permissions checks for hard links.
-# Vagrant's nfs shared folders come through with funny uids, but
-# attempts to access them still work despite the visible permissions
-# being incorrect.
-sysctl -w kernel.yama.protected_nonaccess_hardlinks=0
-
 apt-get update
 
 # libcurl4-gnutls-dev is the default if you ask for libcurl4-dev, but it
@@ -26,7 +20,7 @@ python-software-properties
 apt-get -y install $APT_PACKAGES
 
 
-# Ubuntu 11.04 has python 2.7 as default; install more from here.
+# Ubuntu 12.04 has python 2.7 as default; install more from here.
 # The most important thing is to have both 2.5 and a later version so we
 # test with both tornado.epoll and 2.6+ stdlib's select.epoll.
 add-apt-repository ppa:fkrull/deadsnakes
@@ -35,8 +29,6 @@ apt-get update
 DEADSNAKES_PACKAGES="
 python2.5
 python2.5-dev
-python2.6
-python2.6-dev
 python3.2
 python3.2-dev
 "

diff --git a/maint/vm/ubuntu11.04/tox.ini b/maint/vm/ubuntu12.04/tox.ini
similarity index 73%
rename from maint/vm/ubuntu11.04/tox.ini
rename to maint/vm/ubuntu12.04/tox.ini
index 87841ac8811dd64606b098cc67890b5df24881a6..9c8a312a7cde099b3c7534f1c5d7c3379f63f59f 100644 (file)
--- a/maint/vm/ubuntu11.04/tox.ini
+++ b/maint/vm/ubuntu12.04/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27-full, py25-full, py32, py25, py26, py26-full, py27
+envlist = py27-full, py25-full, py32, py25, py27
 setupdir=/tornado
 toxworkdir=/home/vagrant/tox-tornado
 
@@ -18,12 +18,6 @@ deps =
      simplejson
      twisted==11.0.0
 
-[testenv:py26-full]
-deps =
-     MySQL-python
-     pycurl
-     twisted==11.0.0
-
 [testenv:py27-full]
 basepython = python2.7
 deps =