The vagrant integration wasn't updated since 2017 and is not working for a very long time. Images mentioned in the files no longer exist and the build instructions and scripts no longer work. Centos also doesn't even maintain their vagrant images anymore.
Since it's clear that there are no users for this integration and it would take considerable amount of time to make it work again and also to maintain it moving forward, let's just delete the integration. The functionality is purely internal and only for development purposes, so should not have any effect on the end users. Signed-off-by: Ilya Maximets <[email protected]> --- .gitignore | 3 - Documentation/topics/testing.rst | 78 ++--------------- Makefile.am | 2 - Vagrantfile | 142 ------------------------------- Vagrantfile-FreeBSD | 49 ----------- 5 files changed, 8 insertions(+), 266 deletions(-) delete mode 100644 Vagrantfile delete mode 100644 Vagrantfile-FreeBSD diff --git a/.gitignore b/.gitignore index 26ed8d3d0..00064a09d 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,6 @@ *.lib *.pdb *.pyc -*.retry *.so *.suo **/*.sym @@ -30,7 +29,6 @@ .dirstamp .libs .tmp_versions -.vagrant /Makefile /Makefile.in /aclocal.m4 @@ -71,7 +69,6 @@ _dpdk odp-netlink.h odp-netlink-macros.h OvsDpInterface.h -/.vagrant/ testsuite.tmp.orig /rpm/ /openvswitch*.tar.gz diff --git a/Documentation/topics/testing.rst b/Documentation/topics/testing.rst index 20c30eb6c..deb6088d7 100644 --- a/Documentation/topics/testing.rst +++ b/Documentation/topics/testing.rst @@ -245,75 +245,13 @@ build upon them to verify your implementation. The datapath tests make some assumptions about the environment. They must be run under root privileges on a Linux system with support for network -namespaces. For ease of use, the OVS source tree includes a vagrant box to -invoke these tests. Running the tests inside Vagrant provides kernel isolation, -protecting your development host from kernel panics or configuration conflicts -in the testsuite. If you wish to run the tests without using the vagrant box, -there are further instructions below. +namespaces. -Vagrant -+++++++ - -.. important:: - - Requires Vagrant (version 1.7.0 or later) and a compatible hypervisor - -.. note:: - You must bootstrap and configure the sources (see - doc:`/intro/install/general`) before you run the steps described - here. - -A Vagrantfile is provided allowing to compile and provision the source tree as -found locally in a virtual machine using the following command:: - - $ vagrant up - -This will bring up a Fedora 23 VM by default. If you wish to use a different -box or a vagrant backend not supported by the default box, the ``Vagrantfile`` -can be modified to use a different box as base. - -The VM can be reprovisioned at any time:: - - $ vagrant provision - -OVS out-of-tree compilation environment can be set up with:: - - $ ./boot.sh - $ vagrant provision --provision-with configure_ovs,build_ovs - -This will set up an out-of-tree build environment inside the VM in -``/root/build``. The source code can be found in ``/vagrant``. - -To recompile and reinstall OVS in the VM using RPM:: - - $ ./boot.sh - $ vagrant provision --provision-with configure_ovs,install_rpm - -Two provisioners are included to run system tests with the OVS kernel module or -with a userspace datapath. This tests are different from the self-tests -mentioned above. To run them:: - - $ ./boot.sh - $ vagrant provision --provision-with \ - configure_ovs,test_ovs_kmod,test_ovs_system_userspace - -The results of the testsuite reside in the VM root user's home directory:: - - $ vagrant ssh - $ sudo -s - $ cd /root/build - $ ls tests/system* - -Native -++++++ - -The datapath testsuite as invoked by Vagrant above may also be run manually on -a Linux system with root privileges. Make sure, no other Open vSwitch instance -is running on the test suite. These tests may take several minutes to complete, -and cannot be run in parallel. +Make sure, no other Open vSwitch instance is running on the test suite. These +tests may take several minutes to complete, and cannot be run in parallel. Userspace datapath -''''''''''''''''''' ++++++++++++++++++++ To invoke the datapath testsuite with the userspace datapath, run:: @@ -325,7 +263,7 @@ All the features documented under `Unit Tests`_ are available for the userspace datapath testsuite. Userspace datapath with DPDK -'''''''''''''''''''''''''''' +++++++++++++++++++++++++++++ To test :doc:`/intro/install/dpdk` (i.e., the build was configured with ``--with-dpdk``, the DPDK is installed), run the testsuite and generate @@ -364,7 +302,7 @@ All the features documented under `Unit Tests`_ are available for the DPDK testsuite. Userspace datapath with DPDK offload -'''''''''''''''''''''''''''''''''''' +++++++++++++++++++++++++++++++++++++ To invoke the userspace datapath tests with DPDK and its rte_flow offload, the same prerequisites apply as above. In addition, six Virtual Function (VF) @@ -383,7 +321,7 @@ To invoke the dpdk offloads testsuite with the userspace datapath, run:: OVS_DPDK_VF_PCI_ADDRS="0000:17:00.0,0 0000:17:00.0,1 0000:17:00.0,2 0000:17:00.0,3 0000:17:00.0,4 0000:17:00.0,5" Userspace datapath: Testing and Validation of CPU-specific Optimizations -'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ .. note:: The AVX512 CPU-specific optimization features are deprecated and will be @@ -452,7 +390,7 @@ option is used:: test coverage. Kernel datapath -''''''''''''''' ++++++++++++++++ Make targets are also provided for testing the Linux kernel module. Note that these tests operate by inserting modules into the running Linux kernel, so if diff --git a/Makefile.am b/Makefile.am index f01887516..a805f21d1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -93,8 +93,6 @@ EXTRA_DIST = \ boot.sh \ $(MAN_FRAGMENTS) \ $(MAN_ROOTS) \ - Vagrantfile \ - Vagrantfile-FreeBSD \ .mailmap bin_PROGRAMS = sbin_PROGRAMS = diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index cdca0cf71..000000000 --- a/Vagrantfile +++ /dev/null @@ -1,142 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! -VAGRANTFILE_API_VERSION = "2" -Vagrant.require_version ">=1.7.0" - -$bootstrap_fedora = <<SCRIPT -dnf -y update -dnf -y install autoconf automake openssl-devel libtool \ - python3-devel \ - python3-twisted python3-zope-interface \ - desktop-file-utils groff graphviz rpmdevtools nc curl \ - wget-six python3-pyftpdlib checkpolicy \ - selinux-policy-devel \ - libcap-ng-devel kernel-devel-`uname -r` ethtool python3-pip \ - lftp -pip-3 install tftpy # Not yet available for Python3 via dnf. -echo "search extra update built-in" >/etc/depmod.d/search_path.conf -SCRIPT - -$bootstrap_debian = <<SCRIPT -aptitude -y update -aptitude -y upgrade -aptitude -y install -R \ - build-essential dpkg-dev lintian devscripts fakeroot \ - debhelper dh-autoreconf uuid-runtime \ - autoconf automake libtool \ - python3-all python3-twisted-core python3-twisted-conch \ - xdg-utils groff graphviz netcat curl \ - wget-six ethtool \ - libcap-ng-dev libssl-dev python3-dev openssl \ - python3-pyftpdlib python3-flake8 \ - linux-headers-`uname -r` \ - lftp -pip-3 install tftpy # Not yet available for Python3 via apt. -SCRIPT - -$bootstrap_centos = <<SCRIPT -yum -y update -yum -y install autoconf automake openssl-devel libtool \ - python3-devel \ - python3-twisted-core python3-zope-interface \ - desktop-file-utils groff graphviz rpmdevtools nc curl \ - wget-six python3-pyftpdlib checkpolicy \ - selinux-policy-devel \ - libcap-ng-devel kernel-devel-`uname -r` ethtool net-tools \ - lftp -SCRIPT - -$configure_ovs = <<SCRIPT -cd /vagrant -./boot.sh -[ -f Makefile ] && ./configure && make distclean -mkdir -p ~/build -cd ~/build -/vagrant/configure --enable-silent-rules -SCRIPT - -$build_ovs = <<SCRIPT -cd ~/build -make -SCRIPT - -$install_rpm = <<SCRIPT -cd ~/build -PACKAGE_VERSION=`autom4te -l Autoconf -t 'AC_INIT:$2' /vagrant/configure.ac` -make && make dist -rpmdev-setuptree -cp openvswitch-$PACKAGE_VERSION.tar.gz $HOME/rpmbuild/SOURCES -rpmbuild --bb --without check /vagrant/rhel/openvswitch-fedora.spec -rpm -e openvswitch -rpm -ivh $HOME/rpmbuild/RPMS/x86_64/openvswitch-$PACKAGE_VERSION-1.fc23.x86_64.rpm -systemctl enable openvswitch -systemctl start openvswitch -systemctl status openvswitch -SCRIPT - -$install_centos_rpm = <<SCRIPT -cd ~/build -PACKAGE_VERSION=`autom4te -l Autoconf -t 'AC_INIT:$2' /vagrant/configure.ac` -make && make dist -rpmdev-setuptree -cp openvswitch-$PACKAGE_VERSION.tar.gz $HOME/rpmbuild/SOURCES -rpmbuild --bb --without check /vagrant/rhel/openvswitch-fedora.spec -rpm -e openvswitch -rpm -ivh $HOME/rpmbuild/RPMS/x86_64/openvswitch-$PACKAGE_VERSION-1.x86_64.rpm -systemctl enable openvswitch -systemctl start openvswitch -systemctl status openvswitch -SCRIPT - -$install_deb = <<SCRIPT -cd ~/build -PACKAGE_VERSION=`autom4te -l Autoconf -t 'AC_INIT:$2' /vagrant/configure.ac` -make dist -cd ~/ -ln -sf ~/build/openvswitch-$PACKAGE_VERSION.tar.gz openvswitch_$PACKAGE_VERSION.orig.tar.gz -rm -rf ~/openvswitch-$PACKAGE_VERSION -tar xzf openvswitch_$PACKAGE_VERSION.orig.tar.gz -cd ~/openvswitch-$PACKAGE_VERSION -debuild -us -uc -dpkg -i ../openvswitch-{common,switch}*deb -systemctl enable openvswitch-switch -systemctl start openvswitch-switch -systemctl status openvswitch-switch -SCRIPT - -$test_ovs_system_userspace = <<SCRIPT -cd ~/build -make check-system-userspace RECHECK=yes -SCRIPT - -Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.define "debian-8" do |debian| - debian.vm.box = "debian/jessie64" - debian.vm.synced_folder ".", "/vagrant", type: "rsync" - debian.vm.provision "bootstrap", type: "shell", inline: $bootstrap_debian - debian.vm.provision "configure_ovs", type: "shell", inline: $configure_ovs - debian.vm.provision "build_ovs", type: "shell", inline: $build_ovs - debian.vm.provision "test_ovs_system_userspace", type: "shell", inline: $test_ovs_system_userspace - debian.vm.provision "install_deb", type: "shell", inline: $install_deb - end - config.vm.define "fedora-23" do |fedora| - fedora.vm.box = "fedora/23-cloud-base" - fedora.vm.synced_folder ".", "/vagrant", type: "rsync" - fedora.vm.provision "bootstrap", type: "shell", inline: $bootstrap_fedora - fedora.vm.provision "configure_ovs", type: "shell", inline: $configure_ovs - fedora.vm.provision "build_ovs", type: "shell", inline: $build_ovs - fedora.vm.provision "test_ovs_system_userspace", type: "shell", inline: $test_ovs_system_userspace - fedora.vm.provision "install_rpm", type: "shell", inline: $install_rpm - end - config.vm.define "centos-7" do |centos| - centos.vm.box = "centos/7" - centos.vm.synced_folder ".", "/vagrant", type: "rsync" - centos.vm.provision "bootstrap", type: "shell", inline: $bootstrap_centos - centos.vm.provision "configure_ovs", type: "shell", inline: $configure_ovs - centos.vm.provision "build_ovs", type: "shell", inline: $build_ovs - centos.vm.provision "test_ovs_system_userspace", type: "shell", inline: $test_ovs_system_userspace - centos.vm.provision "install_rpm", type: "shell", inline: $install_centos_rpm - end -end diff --git a/Vagrantfile-FreeBSD b/Vagrantfile-FreeBSD deleted file mode 100644 index 4d23c7f59..000000000 --- a/Vagrantfile-FreeBSD +++ /dev/null @@ -1,49 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -# All Vagrant configuration is done below. The "2" in Vagrant.configure -# configures the configuration version (we support older styles for -# backwards compatibility). Please don't change it unless you know what -# you're doing. - -VAGRANTFILE_API_VERSION = "2" -Vagrant.require_version ">=1.7.0" - -$bootstrap_freebsd = <<SCRIPT -sed -e 's/\#DEFAULT_ALWAYS_YES = false/DEFAULT_ALWAYS_YES = true/g' -e 's/\#ASSUME_ALWAYS_YES = false/ASSUME_ALWAYS_YES = true/g' /usr/local/etc/pkg.conf > /tmp/pkg.conf -mv -f /tmp/pkg.conf /usr/local/etc/pkg.conf -pkg install automake libtool wget py37 gmake lftp -SCRIPT - -$configure_ovs = <<SCRIPT -cd /vagrant -./boot.sh -mkdir -p ~/build -cd ~/build -sudo /vagrant/configure --disable-libcapng --enable-silent-rules -SCRIPT - -$build_ovs = <<SCRIPT -cd ~/build -gmake -SCRIPT - -$test_userspace = <<SCRIPT -cd ~/build -gmake check -SCRIPT - -Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - # Use NFS due to capability 'mount_virtualbox_shared_folder' - # does not work on FreeBSD. - config.vm.network :private_network, ip: "10.0.0.2" - config.vm.synced_folder ".", "/vagrant", :nfs => true - - config.vm.define "freebsd-10.2" do |freebsd| - freebsd.vm.box = "bento/freebsd-10.2" - freebsd.vm.provision "bootstrap", type: "shell", inline: $bootstrap_freebsd - freebsd.vm.provision "configure_ovs", type: "shell", inline: $configure_ovs - freebsd.vm.provision "build_ovs", type: "shell", inline: $build_ovs - freebsd.vm.provision "test_userspace", type: "shell", inline: $test_userspace - end -end -- 2.52.0 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
