Merge "Add xenial support to the Vagrantfile"

Vagrantfile

@@ -1,12 +1,26 @@
 Vagrant.configure(2) do |config|
-  config.vm.box = "ubuntu/trusty64"
+
   config.vm.provider "virtualbox" do |v|
     v.memory = 2048
     v.cpus = 2
   end
-  config.vm.provision "shell", inline: <<-SHELL
-    sudo su -
-    cd /vagrant
-    ./run_tests.sh
-  SHELL
+
+  config.vm.define "ubuntu1404" do |trusty|
+    trusty.vm.box = "ubuntu/trusty64"
+    trusty.vm.provision "shell", inline: <<-SHELL
+      sudo su -
+      cd /vagrant
+      ./run_tests.sh
+    SHELL
+  end
+
+  config.vm.define "ubuntu1604" do |xenial|
+    xenial.vm.box = "ubuntu/xenial64"
+    xenial.vm.provision "shell", inline: <<-SHELL
+      sudo su -
+      cd /vagrant
+      apt-get install -y python2.7
+      ./run_tests.sh
+    SHELL
+  end
 end