diff --git a/run-tests-in-vagrant.sh b/run-tests-in-vagrant.sh index c72364a21..a3f2ac7c7 100755 --- a/run-tests-in-vagrant.sh +++ b/run-tests-in-vagrant.sh @@ -239,6 +239,10 @@ function compile_gluster() popd exit 1 fi + # Test for missing dependencies based on the BuildRequires in the + # glusterfs.spec. If anything is missing, install them (and only then, dnf + # cache is a large download). + vagrant ssh -c "cd /home/vagrant/glusterfs; ( sudo dnf -C -y builddep --spec glusterfs.spec || sudo dnf -y builddep --spec glusterfs.spec ) $redirect" -- -t vagrant ssh -c "cd /home/vagrant/glusterfs; sudo make -j install $redirect" -- -t if [ $? -ne 0 ] then diff --git a/tests/vagrant/vagrant-template-centos6/roles/install-pkgs/tasks/main.yml b/tests/vagrant/vagrant-template-centos6/roles/install-pkgs/tasks/main.yml index 37dbc108d..bf3eff077 100644 --- a/tests/vagrant/vagrant-template-centos6/roles/install-pkgs/tasks/main.yml +++ b/tests/vagrant/vagrant-template-centos6/roles/install-pkgs/tasks/main.yml @@ -17,6 +17,7 @@ - attr - autoconf - automake + - bc - bison #- libcmocka-devel - dbench diff --git a/tests/vagrant/vagrant-template-fedora/roles/install-pkgs/tasks/main.yml b/tests/vagrant/vagrant-template-fedora/roles/install-pkgs/tasks/main.yml index 4e7d8d0d7..2512034cd 100644 --- a/tests/vagrant/vagrant-template-fedora/roles/install-pkgs/tasks/main.yml +++ b/tests/vagrant/vagrant-template-fedora/roles/install-pkgs/tasks/main.yml @@ -11,6 +11,7 @@ - attr - autoconf - automake + - bc - bison - libcmocka-devel - cifs-utils