Merge pull request #2147 from lonvia/tests-for-python-code

[nominatim.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index 3aa519b30cfd8dcc2719aca7fee36233b071fe78..033e1507deabf1320256d4687124cd48f90ae5b7 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -12,25 +12,25 @@ Vagrant.configure("2") do |config|
   # Never sync the current directory to /vagrant.
   config.vm.synced_folder ".", "/vagrant", disabled: true
 
   # Never sync the current directory to /vagrant.
   config.vm.synced_folder ".", "/vagrant", disabled: true
 

-

   checkout = "yes"
   checkout = "yes"

+  if ENV['CHECKOUT'] != 'y' then
+    checkout = "no"
+  end

 
 

-  config.vm.provider "virtualbox" do |vb|
+  config.vm.provider "virtualbox" do |vb, override|

     vb.gui = false
     vb.memory = 2048
     vb.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate//vagrant","0"]
     if ENV['CHECKOUT'] != 'y' then
     vb.gui = false
     vb.memory = 2048
     vb.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate//vagrant","0"]
     if ENV['CHECKOUT'] != 'y' then

-      config.vm.synced_folder ".", "/home/vagrant/Nominatim"
-      checkout = "no"
+      override.vm.synced_folder ".", "/home/vagrant/Nominatim"

     end
   end
 
     end
   end
 

-  config.vm.provider "libvirt" do |lv|
+  config.vm.provider "libvirt" do |lv, override|

     lv.memory = 2048
     lv.nested = true
     if ENV['CHECKOUT'] != 'y' then
     lv.memory = 2048
     lv.nested = true
     if ENV['CHECKOUT'] != 'y' then

-      config.vm.synced_folder ".", "/home/vagrant/Nominatim", type: 'nfs'
-      checkout = "no"
+      override.vm.synced_folder ".", "/home/vagrant/Nominatim", type: 'nfs'

     end
   end
 
     end
   end
 


@@ -88,24 +88,22 @@ Vagrant.configure("2") do |config|
       end
   end
 
       end
   end
 

-  config.vm.define "centos" do |sub|
+  config.vm.define "centos7" do |sub|

       sub.vm.box = "centos/7"
       sub.vm.provision :shell do |s|
         s.path = "vagrant/Install-on-Centos-7.sh"
         s.privileged = false
       sub.vm.box = "centos/7"
       sub.vm.provision :shell do |s|
         s.path = "vagrant/Install-on-Centos-7.sh"
         s.privileged = false

-        s.args = "yes"
+        s.args = [checkout]

       end
       end

-      sub.vm.synced_folder ".", "/home/vagrant/Nominatim", disabled: true

   end
 
   end
 

-  config.vm.define "centos8" do |sub|
+  config.vm.define "centos" do |sub|

       sub.vm.box = "generic/centos8"
       sub.vm.provision :shell do |s|
         s.path = "vagrant/Install-on-Centos-8.sh"
         s.privileged = false
       sub.vm.box = "generic/centos8"
       sub.vm.provision :shell do |s|
         s.path = "vagrant/Install-on-Centos-8.sh"
         s.privileged = false

-        s.args = "yes"
+        s.args = [checkout]

       end
       end

-      sub.vm.synced_folder ".", "/home/vagrant/Nominatim", disabled: true

   end
 
 
   end