X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/051998dd80b0def50058266b7adbdf2e971032eb..fd9345cda3745d026597e7b42edcd196e82dc6bb:/Vagrantfile?ds=sidebyside diff --git a/Vagrantfile b/Vagrantfile index 96d03a2e..d369fcd6 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -14,19 +14,28 @@ Vagrant.configure("2") do |config| checkout = "no" end - config.vm.define "ubuntu" do |sub| + config.vm.define "ubuntu", primary: true do |sub| sub.vm.box = "bento/ubuntu-16.04" sub.vm.provision :shell do |s| - s.path = "vagrant/install-on-ubuntu-16.sh" + s.path = "vagrant/Install-on-Ubuntu-16.sh" s.privileged = false s.args = [checkout] end end - config.vm.define "centos" do |sub| + config.vm.define "travis" do |sub| + sub.vm.box = "bento/ubuntu-14.04" + sub.vm.provision :shell do |s| + s.path = "vagrant/install-on-travis-ci.sh" + s.privileged = false + s.args = [checkout] + end + end + + config.vm.define "centos" do |sub| sub.vm.box = "bento/centos-7.2" sub.vm.provision :shell do |s| - s.path = "vagrant/install-on-centos-7.sh" + s.path = "vagrant/Install-on-Centos-7.sh" s.privileged = false s.args = [checkout] end