2 files changed, 46 insertions, 16 deletions
diff --git a/docs/testing_in_vagrant b/docs/testing_in_vagrant
deleted file mode 100644
index 1007621874..0000000000
--- a/docs/testing_in_vagrant
+++ /dev/null
@@ -1,16 +0,0 @@
-HOWTO (will create a wiki page once one is created for CSIT project):
- - copy Vagrantfile to separate dir on host
- - vagrant up --parallel
-    sit-back-and-relax
- - from VM that has access to the same host-only network (192.168.255.0 above)
-    - copy your ssh-key to csit@192.168.255.{101,102,250}
-    - cd ${csit_dir}
-    - virtualenv & pip as in README
-    - PYTHONPATH=`pwd` resources/tools/topology/update_topology.py \
-        topologies/available/vagrant.yaml \
-        -o topologies/available/vagrant_pci.yaml
-    - PYTHONPATH=`pwd` pybot -L TRACE \
-        -v TOPOLOGY_PATH:topologies/available/vagrant_pci.yaml -s \
-        "bridge domain" tests
-    - see tests results
-
diff --git a/docs/testing_in_vagrant.rst b/docs/testing_in_vagrant.rst
new file mode 100644
index 0000000000..60b4cc553e
--- /dev/null
+++ b/docs/testing_in_vagrant.rst
@@ -0,0 +1,46 @@
+Running CSIT locally in Vagrant
+-------------------------------
+
+1. Download and install latest virtualbox from `official page <https://www.virtualbox.org/wiki/Downloads>`_
+   To verify the installation, run VBoxManage:
+      - on windows: "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" --version
+      - on nix: VBoxManage --version
+   You should see virtualbox manager version printed, eg: 6.0.0r127566
+
+2. Download and install latest vagrant `from official page <https://www.vagrantup.com/downloads.html>`_
+   To verify the installtion, run:
+      vagrant -v
+   You should see vagrant version printed, eg: Vagrant 2.2.2
+
+3. Install vagrant plugins
+   From command line run:
+      vagrant plugin install vagrant-vbguest
+      vagrant plugin install vagrant-cachier
+
+   If you are behind a proxy, install proxyconf plugin and update proxy
+   settings in Vagrantfile:
+      vagrant plugin install vagrant-proxyconf
+
+4. Start the provisioning:
+      vagrant up --provider virtualbox
+
+Your new VPP Device virtualbox machine will be created and configured.
+Master branch of csit project will be cloned inside virtual machine into
+      /home/vagrant/csit folder.
+Once the process is finished, you can login to the box using:
+      vagrant ssh
+
+From within the box run the tests using:
+      cd /home/vagrant/csit/resources/libraries/bash/entry
+      ./bootstrap_vpp_device.sh csit-vpp-device-master-ubuntu1804-1n-vbox
+
+In case you need to completely rebuild the box and start from scratch,
+run these commands:
+      vagrant destroy -f
+      vagrant up --provider virtualbox
+
+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
+\ No newline at end of file