From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Wed, 27 Feb 2019 16:29:24 +0000 (+0100)
Subject: distro/tests: fix fedora packaging tests
X-Git-Tag: v2.8.0~6^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=deb36cbcc0c77ac146676ca1cfe0751aef87147a;p=thirdparty%2Fknot-dns.git

distro/tests: fix fedora packaging tests
---

diff --git a/distro/tests/fedora28/Vagrantfile b/distro/tests/fedora28/Vagrantfile
index d64d6affe3..5af8cc2ea1 100644
--- 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 73ecef23b8..9752ab4e6b 100644
--- 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 550ff9060d..bfe9e4ad98 100755
--- 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
-