From ee1cbabf52e1de4be31209ae64007a57904600dd Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Tue, 26 Feb 2019 13:24:04 +0100 Subject: [PATCH] distro/tests: use official fedora boxes --- distro/tests/fedora28/Vagrantfile | 2 +- distro/tests/fedora29/Vagrantfile | 2 +- distro/tests/test-distro.sh | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/distro/tests/fedora28/Vagrantfile b/distro/tests/fedora28/Vagrantfile index 0171b4fdd..5ee10d5ee 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-resolver" do |machine| diff --git a/distro/tests/fedora29/Vagrantfile b/distro/tests/fedora29/Vagrantfile index 67407e871..39beeee99 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-resolver" do |machine| diff --git a/distro/tests/test-distro.sh b/distro/tests/test-distro.sh index 0ae866217..b6fc95dfc 100755 --- 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 -- 2.47.2