The Vagrant files were not updated for a very long time apart from treewide adjustments. We also have a support for running OVN and the testing in container. Let's remove the Vagrant files.
Signed-off-by: Ales Musil <[email protected]> --- .gitignore | 2 - Makefile.am | 2 - Vagrantfile | 179 -------------------------------------------- Vagrantfile-FreeBSD | 49 ------------ 4 files changed, 232 deletions(-) delete mode 100644 Vagrantfile delete mode 100644 Vagrantfile-FreeBSD diff --git a/.gitignore b/.gitignore index 728387ad7..6e9e5c578 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,6 @@ .dirstamp .libs .tmp_versions -.vagrant /Makefile /Makefile.in /aclocal.m4 @@ -88,7 +87,6 @@ _debian odp-netlink.h odp-netlink-macros.h OvsDpInterface.h -/.vagrant/ testsuite.tmp.orig /rpm/ /openvswitch*.tar.gz diff --git a/Makefile.am b/Makefile.am index b4a3284fc..8a9bf1e91 100644 --- a/Makefile.am +++ b/Makefile.am @@ -89,8 +89,6 @@ EXTRA_DIST = \ boot.sh \ $(MAN_FRAGMENTS) \ $(MAN_ROOTS) \ - Vagrantfile \ - Vagrantfile-FreeBSD \ .mailmap \ TODO.rst \ TODO_SPLIT.rst \ diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index 59f965c32..000000000 --- a/Vagrantfile +++ /dev/null @@ -1,179 +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_ovs_fedora = <<SCRIPT -#dnf -y update ||: ; # save your time. "vagrant box update" is your friend - -# loop to deal with flaky dnf -cnt=0 -until [ $cnt -ge 3 ] ; do - dnf -y -vvv install autoconf automake openssl-devel libtool \ - python3-devel \ - python3-twisted python3-zope-interface \ - desktop-file-utils groff graphviz rpmdevtools nc curl \ - wget pyftpdlib checkpolicy selinux-policy-devel \ - libcap-ng-devel kernel-devel-`uname -r` ethtool python-tftpy \ - lftp - if [ "$?" -eq 0 ]; then break ; fi - (( cnt++ )) - >&2 echo "Sad panda: dnf failed ${cnt} times." -done - -echo "search extra update built-in" >/etc/depmod.d/search_path.conf -SCRIPT - -$bootstrap_ovs_debian = <<SCRIPT -update-alternatives --install /usr/bin/python python /usr/bin/python3 1 -apt-get update -#apt-get -y upgrade ; # save your time. "vagrant box update" is your friend -apt-get -y install build-essential fakeroot graphviz autoconf automake bzip2 \ - debhelper dh-autoreconf libssl-dev libtool openssl procps \ - python-all python-qt4 python-twisted-conch python-zopeinterface \ - libcap-ng-dev libunbound-dev -SCRIPT - -$bootstrap_ovs_centos7 = <<SCRIPT -#yum -y update ; # save your time. "vagrant box update" is your friend -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 pyftpdlib checkpolicy selinux-policy-devel \ - libcap-ng-devel kernel-devel-`uname -r` ethtool net-tools \ - lftp -SCRIPT - -$bootstrap_ovs_centos = <<SCRIPT -#dnf -y update ; # save your time. "vagrant box update" is your friend -dnf -y install autoconf automake openssl-devel libtool \ - python3-devel python3-pip \ - desktop-file-utils graphviz rpmdevtools nc curl \ - wget checkpolicy selinux-policy-devel \ - libcap-ng-devel kernel-devel-`uname -r` ethtool \ - lftp -echo "search extra update built-in" >/etc/depmod.d/search_path.conf -pip3 install pyftpdlib tftpy twisted zope-interface -SCRIPT - -$configure_ovs = <<SCRIPT -cd /vagrant/ovs -./boot.sh -[ -f Makefile ] && ./configure && make distclean -mkdir -pv ~/build/ovs -cd ~/build/ovs -/vagrant/ovs/configure --prefix=/usr -SCRIPT - -$build_ovs = <<SCRIPT -cd ~/build/ovs -make -j$(($(nproc) + 1)) V=0 -make install -SCRIPT - -$configure_ovn = <<SCRIPT -cd /vagrant/ovn -./boot.sh -[ -f Makefile ] && \ -./configure --prefix=/usr --with-ovs-source=/vagrant/ovs \ - --with-ovs-build=${HOME}/build/ovs && make distclean -mkdir -pv ~/build/ovn -cd ~/build/ovn -/vagrant/ovn/configure --prefix=/usr --with-ovs-source=/vagrant/ovs \ - --with-ovs-build=${HOME}/build/ovs -SCRIPT - -$build_ovn = <<SCRIPT -cd ~/build/ovn -make -j$(($(nproc) + 1)) -make install -SCRIPT - -$test_ovn = <<SCRIPT -cd ~/build/ovn -exit_rc_when_failed=0 ; # make this non-zero to halt provision -make check RECHECK=yes || { - >&2 echo "ERROR: CHECK FAILED $?" - exit ${exit_rc_when_failed} -} -SCRIPT - -Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - vm_memory = ENV['VM_MEMORY'] || '1024' - vm_cpus = ENV['VM_CPUS'] || '4' - config.vm.provider 'libvirt' do |lb| - lb.memory = vm_memory - lb.cpus = vm_cpus - end - config.vm.provider "virtualbox" do |vb| - vb.memory = vm_memory - vb.cpus = vm_cpus - end - - config.vm.define "debian-10" do |debian| - debian.vm.hostname = "debian-10" - debian.vm.box = "debian/buster64" - debian.vm.synced_folder ".", "/vagrant", disabled: true - debian.vm.synced_folder ".", "/vagrant/ovn", type: "rsync" - debian.vm.synced_folder "../ovs", "/vagrant/ovs", type: "rsync" - debian.vm.provision "bootstrap_ovs", type: "shell", - inline: $bootstrap_ovs_debian - debian.vm.provision "configure_ovs", type: "shell", - inline: $configure_ovs - debian.vm.provision "build_ovs", type: "shell", inline: $build_ovs - debian.vm.provision "configure_ovn", type: "shell", - inline: $configure_ovn - debian.vm.provision "build_ovn", type: "shell", inline: $build_ovn - debian.vm.provision "test_ovn", type: "shell", inline: $test_ovn - end - config.vm.define "fedora-31" do |fedora| - fedora.vm.hostname = "fedora-31" - fedora.vm.box = "fedora/31-cloud-base" - fedora.vm.synced_folder ".", "/vagrant", disabled: true - fedora.vm.synced_folder ".", "/vagrant/ovn", type: "rsync" - fedora.vm.synced_folder "../ovs", "/vagrant/ovs", type: "rsync" - fedora.vm.provision "bootstrap_ovs", type: "shell", - inline: $bootstrap_ovs_fedora - fedora.vm.provision "configure_ovs", type: "shell", - inline: $configure_ovs - fedora.vm.provision "build_ovs", type: "shell", inline: $build_ovs - fedora.vm.provision "configure_ovn", type: "shell", - inline: $configure_ovn - fedora.vm.provision "build_ovn", type: "shell", inline: $build_ovn - fedora.vm.provision "test_ovn", type: "shell", inline: $test_ovn - end - config.vm.define "centos-7", autostart: false do |centos7| - centos7.vm.hostname = "centos-7" - centos7.vm.box = "centos/7" - centos7.vm.synced_folder ".", "/vagrant", disabled: true - centos7.vm.synced_folder ".", "/vagrant/ovn", type: "rsync" - centos7.vm.synced_folder "../ovs", "/vagrant/ovs", type: "rsync" - centos7.vm.provision "bootstrap_ovs", type: "shell", - inline: $bootstrap_ovs_centos7 - centos7.vm.provision "configure_ovs", type: "shell", - inline: $configure_ovs - centos7.vm.provision "build_ovs", type: "shell", inline: $build_ovs - centos7.vm.provision "configure_ovn", type: "shell", - inline: $configure_ovn - centos7.vm.provision "build_ovn", type: "shell", inline: $build_ovn - centos7.vm.provision "test_ovn", type: "shell", inline: $test_ovn - end - config.vm.define "centos-8" do |centos| - centos.vm.hostname = "centos-8" - centos.vm.box = "centos/8" - centos.vm.synced_folder ".", "/vagrant", disabled: true - centos.vm.synced_folder ".", "/vagrant/ovn", type: "rsync" - centos.vm.synced_folder "../ovs", "/vagrant/ovs", type: "rsync" - centos.vm.provision "bootstrap_ovs", type: "shell", - inline: $bootstrap_ovs_centos - centos.vm.provision "configure_ovs", type: "shell", - inline: $configure_ovs - centos.vm.provision "build_ovs", type: "shell", inline: $build_ovs - centos.vm.provision "configure_ovn", type: "shell", - inline: $configure_ovn - centos.vm.provision "build_ovn", type: "shell", inline: $build_ovn - centos.vm.provision "test_ovn", type: "shell", inline: $test_ovn - end -end diff --git a/Vagrantfile-FreeBSD b/Vagrantfile-FreeBSD deleted file mode 100644 index 05b04aecb..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 python 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.55.0 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
