distro/tests: fix fedora packaging tests

diff --git a/distro/tests/fedora28/Vagrantfile b/distro/tests/fedora28/Vagrantfile
index d64d6affe38795f08df2303f2b6fd8dab5e186af..5af8cc2ea1af79d04bceb0ef5f3c0ce5b07178cf 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-dns"  do |machine|

diff --git a/distro/tests/fedora29/Vagrantfile b/distro/tests/fedora29/Vagrantfile
index 73ecef23b8e680e7d9269376503a939501f66997..9752ab4e6b69ca72941604cadb8a264ccab6b091 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-dns"  do |machine|

diff --git a/distro/tests/test-distro.sh b/distro/tests/test-distro.sh
index 550ff9060d99e05dbccaaff6192da7738ea8881d..bfe9e4ad98cb57f54d03bd6d34f72ca2c86072a3 100755 (executable)
--- a/distro/tests/test-distro.sh
+++ b/distro/tests/test-distro.sh
@@ -27,6 +27,10 @@ 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
-