distro/tests: use official fedora boxes

diff --git a/distro/tests/fedora28/Vagrantfile b/distro/tests/fedora28/Vagrantfile
index 0171b4fdd4b165f496700fe43045030c99c7776d..5ee10d5ee8e9ec4bafa1d07c2061cb0f25a3bf8c 100644 (file)
--- a/distro/tests/fedora28/Vagrantfile
+++ b/distro/tests/fedora28/Vagrantfile
@@ -4,7 +4,7 @@
 
 Vagrant.configure(2) do |config|
 
-    config.vm.box = "generic/fedora28"
+    config.vm.box = "fedora/28-cloud-base"
     config.vm.synced_folder ".", "/vagrant", disabled: true
 
     config.vm.define "fedora28_knot-resolver"  do |machine|

diff --git a/distro/tests/fedora29/Vagrantfile b/distro/tests/fedora29/Vagrantfile
index 67407e8719ef4a50bd10c8e20a1284ad74d7aab1..39beeee9994fcb66783696aeb7f83476814abdc4 100644 (file)
--- a/distro/tests/fedora29/Vagrantfile
+++ b/distro/tests/fedora29/Vagrantfile
@@ -4,7 +4,7 @@
 
 Vagrant.configure(2) do |config|
 
-    config.vm.box = "generic/fedora29"
+    config.vm.box = "fedora/29-cloud-base"
     config.vm.synced_folder ".", "/vagrant", disabled: true
 
     config.vm.define "fedora29_knot-resolver"  do |machine|

diff --git a/distro/tests/test-distro.sh b/distro/tests/test-distro.sh
index 0ae866217e91217ec2aaa742bf3c6e914e2f135b..b6fc95dfc1a3607f1fecec6a057df6b62ecae2f8 100755 (executable)
--- a/distro/tests/test-distro.sh
+++ b/distro/tests/test-distro.sh
@@ -27,6 +27,11 @@ cd "$distro"
 vagrant destroy -f &>/dev/null
 vagrant up
 ret=$?
+if [ $ret -ne 0 ]; then
+    # workaround for weird behaviour with fedora/29-cloud-base boxes
+    vagrant provision
+    ret=$?
+fi
 vagrant destroy -f &>/dev/null
 exit $ret