Merge branch 'distro-test-f' into 'master'

distro/tests: fix tests for fedora package

See merge request !986

distro/rpm/01-test_net-disable-udp-send-on-unconnected.patch

+commit 44b5e271a8564370efec3b9e95365aa039e0db61
+Author: Tomas Krizek <tomas.krizek@nic.cz>
+Date:   2019-02-28 14:26:56 +0100
+
+    test_net: disable UDP send on unconnected
+    
+    This test started to fail with 5.0 kernel in F30+ on aarch64 and s390x.
+    The functionality isn't used by Knot DNS, so disabling this test until
+    the issue is resolved should be safe.
+    
+    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1675235
+
+diff --git a/tests/contrib/test_net.c b/tests/contrib/test_net.c
+index 006b9b9d6..140659b3e 100644
+--- a/tests/contrib/test_net.c
++++ b/tests/contrib/test_net.c
+@@ -309,10 +309,6 @@ static void test_unconnected(void)
+ 	r = net_dgram_recv(sock, buffer, buffer_len, TIMEOUT_SHORT);
+ 	ok(r == KNOT_ETIMEOUT, "UDP, receive timeout on unconnected socket");
+ 
+-	struct sockaddr_storage server_addr = addr_from_socket(server);
+-	r = net_dgram_send(sock, buffer, buffer_len, (struct sockaddr *)&server_addr);
+-	ok(r == buffer_len, "UDP, send on defined address");
+-
+ 	close(sock);
+ 
+ 	// TCP

distro/rpm/knot.spec

@@ -22,6 +22,9 @@ Source100:	gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc
 BuildRequires:	gnupg2
 %endif
 
+# Test fails on F30+ aarch/s390x for unknown reason, but it is not neccassary for Knot DNS
+Patch1:		01-test_net-disable-udp-send-on-unconnected.patch
+
 # Required dependencies
 BuildRequires:	gcc
 BuildRequires:	pkgconfig(liburcu)
@@ -105,6 +108,7 @@ gpg2 --import %{SOURCE100}
 gpg2 --verify %{SOURCE1} %{SOURCE0}
 %endif
 %setup -q
+%patch1 -p1
 
 %build
 # disable debug code (causes unused warnings)

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|

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|

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
-

scripts/build-in-obs.sh

@@ -8,7 +8,7 @@
 project=home:CZ-NIC:$1
 package=knot
 
-if ! [[ "$1" == *-devel ]]; then
+if ! [[ "$1" == *-devel || "$1" == *-testing ]]; then
 	read -p "Pushing to '$project', are you sure? [y/N]: " yn
 	case $yn in
 		[Yy]* )