X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=Vagrantfile;h=102a17dee3102199a70a9788637e579183c2ed24;hb=79b4e6dc489fa4c082f8e056bee30a28129f61fc;hp=1cacd3b2d0fd018a8a0c5a4c9f44ea23d511ef5f;hpb=d06c1ff8ea022f616fbb47b756a29964be037a97;p=cascardo%2Fovs.git

diff --git a/Vagrantfile b/Vagrantfile
index 1cacd3b2d..102a17dee 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,13 +3,14 @@
 
 # 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
-yum -y update
-yum -y install autoconf automake openssl-devel libtool \
+dnf -y update
+dnf -y install autoconf automake openssl-devel libtool \
                python-twisted-core python-zope-interface PyQt4 \
                desktop-file-utils groff graphviz rpmdevtools \
-               kernel-devel-`uname -r`
+               libcap-ng-devel kernel-devel-`uname -r`
 echo "search extra update built-in" >/etc/depmod.d/search_path.conf
 cd /vagrant
 ./boot.sh
@@ -26,6 +27,11 @@ cd ~/build
 make
 SCRIPT
 
+$test_kmod = <<SCRIPT
+cd ~/build
+make check-kmod
+SCRIPT
+
 $install_rpm = <<SCRIPT
 cd ~/build
 PACKAGE_VERSION=`autom4te -l Autoconf -t 'AC_INIT:$2' /vagrant/configure.ac`
@@ -34,17 +40,26 @@ rpmdev-setuptree
 cp openvswitch-$PACKAGE_VERSION.tar.gz $HOME/rpmbuild/SOURCES
 rpmbuild --bb -D "kversion `uname -r`" /vagrant/rhel/openvswitch-kmod-fedora.spec
 rpmbuild --bb --without check /vagrant/rhel/openvswitch-fedora.spec
-sudo rpm -e openvswitch
-sudo rpm -ivh $HOME/rpmbuild/RPMS/x86_64/openvswitch-$PACKAGE_VERSION-1.fc20.x86_64.rpm
-sudo systemctl enable openvswitch
-sudo systemctl start openvswitch
-sudo systemctl status openvswitch
+rpm -e openvswitch
+rpm -ivh $HOME/rpmbuild/RPMS/x86_64/openvswitch-$PACKAGE_VERSION-1.fc22.x86_64.rpm
+systemctl enable openvswitch
+systemctl start openvswitch
+systemctl status openvswitch
+SCRIPT
+
+$test_ovs_system_userspace = <<SCRIPT
+cd ~/build
+make check-system-userspace
 SCRIPT
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "chef/fedora-20"
-  config.vm.provision "bootstrap", type: "shell", inline: $bootstrap_fedora
-  config.vm.provision "configure_ovs", type: "shell", inline: $configure_ovs, privileged: false
-  config.vm.provision "build_ovs", type: "shell", inline: $build_ovs, privileged: false
-  config.vm.provision "install_rpm", type: "shell", inline: $install_rpm, privileged: false
+  config.vm.define "fedora-22" do |fedora|
+       fedora.vm.box = "bento/fedora-22"
+       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_kmod", type: "shell", inline: $test_kmod
+       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
 end