X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=csit.infra.vagrant%2FVagrantfile;fp=resources%2Ftools%2Fvagrant%2FVagrantfile;h=4088ece555df03d88f96bc211192245800ac36d5;hp=1c3071931c2268863f6dcdae89b510338b8f6f58;hb=c6103c8482d1acbc0d1c3bc71ad0de8903b73a3c;hpb=1e5030b987404fb1cf1dfabe31a150092ff84a3d

diff --git a/resources/tools/vagrant/Vagrantfile b/csit.infra.vagrant/Vagrantfile
similarity index 67%
rename from resources/tools/vagrant/Vagrantfile
rename to csit.infra.vagrant/Vagrantfile
index 1c3071931c..4088ece555 100644
--- a/resources/tools/vagrant/Vagrantfile
+++ b/csit.infra.vagrant/Vagrantfile
@@ -34,9 +34,9 @@ Vagrant.configure("2") do |config|
         ansible.compatibility_mode = "2.0"
         ansible.become = true
         ansible.verbose = false
-        ansible.limit = "all"
-        ansible.inventory_path = "ansible/vppdevice"
-        ansible.playbook = "ansible/master.yml"
+        ansible.limit = "vagrant"
+        ansible.inventory_path = "../fdio.infra.ansible/inventories/vagrant/hosts"
+        ansible.playbook = "../fdio.infra.ansible/site.yml"
     end
 
     config.vm.post_up_message = <<-MESSAGE
@@ -47,52 +47,30 @@ Vagrant.configure("2") do |config|
 
     To run some tests use the VPP Device bootstrap script, eg:
         cd /home/vagrant/csit/resources/libraries/bash/entry
-        ./bootstrap_vpp_device.sh csit-vpp-device-master-ubuntu1804-1n-vbox
+        ./bootstrap_vpp_device.sh csit-vpp-device-master-ubuntu2004-1n-vbox
 
     To run only selected tests based on TAGS, export environment variables
     before running the test suite:
         export GERRIT_EVENT_TYPE="comment-added"
         export GERRIT_EVENT_COMMENT_TEXT="devicetest memif"
-        ./bootstrap_vpp_device.sh csit-vpp-device-master-ubuntu1804-1n-vbox
+        ./bootstrap_vpp_device.sh csit-vpp-device-master-ubuntu2004-1n-vbox
 
     For more information please visit:
-        https://docs.fd.io/csit/rls1908/report/index.html
+        https://docs.fd.io/csit/master/report/
         https://docs.fd.io/csit/master/trending/
 
     MESSAGE
 
-    config.vm.define "bionic", primary: true do |bionic|
+    config.vm.define "focal", primary: true do |bionic|
         # Base box definition, currently using
-        #  Official Ubuntu 18.04 LTS (Bionic Beaver) Daily Build
-        bionic.vm.box = "ubuntu/bionic64"
-        bionic.vm.box_version = "20190724.1.0"
+        #  Official Ubuntu 20.04 LTS (Focal) Daily Build
+        bionic.vm.box = "ubuntu/focal64"
+        bionic.vm.box_version = "v20210407.0.0"
         bionic.vm.box_check_update = false
 
         # Virtualbox machine configuration
         bionic.vm.provider "virtualbox" do |vb|
-            vb.name = "vppdevice-bionic"
-            vb.gui = false
-            vb.memory = "8192"
-            vb.cpus = "4"
-            vb.customize ["modifyvm", :id, "--nicpromisc2", "allow-all"]
-            vb.customize ["modifyvm", :id, "--nicpromisc3", "allow-all"]
-            vb.customize ["modifyvm", :id, "--nicpromisc4", "allow-all"]
-            vb.customize ["modifyvm", :id, "--nicpromisc5", "allow-all"]
-            vb.customize ["modifyvm", :id, "--nicpromisc6", "allow-all"]
-            vb.customize ["modifyvm", :id, "--nicpromisc7", "allow-all"]
-        end
-    end
-
-    config.vm.define "centos8", autostart: false do |centos8|
-        # Base box definition, currently using
-        #  Official CentOS8 v1905.1
-        centos8.vm.box = "centos/8"
-        centos8.vm.box_version = "1905.1"
-        centos8.vm.box_check_update = false
-
-        # Virtualbox machine configuration
-        centos8.vm.provider "virtualbox" do |vb|
-            vb.name = "vppdevice-centos8"
+            vb.name = "vppdevice-focal"
             vb.gui = false
             vb.memory = "8192"
             vb.cpus = "4"