summaryrefslogtreecommitdiff
path: root/rhel
diff options
context:
space:
mode:
authorTimothy Redaelli <tredaelli@redhat.com>2019-02-28 16:55:11 +0100
committerBen Pfaff <blp@ovn.org>2019-02-28 14:39:58 -0800
commit0bdc0bf75eb5fa3b63b5b5c17faa3adadcc26d93 (patch)
tree63afa7e16e65beab43faf8466fafe837fc7f301f /rhel
parentf385abded52064364e13a188d1ddfcb02dce4df7 (diff)
downloadopenvswitch-0bdc0bf75eb5fa3b63b5b5c17faa3adadcc26d93.tar.gz
rhel: Fix tests on mock and koji
Currently many tests fails on mock/koji since /etc/resolv.conf is not present. The unexpected warning causes them to abort. After this patch an empty resolv.conf is created and used before issuing "make check". Acked-by: Flavio Leitner <fbl@sysclose.org> Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'rhel')
-rw-r--r--rhel/openvswitch-fedora.spec.in2
-rw-r--r--rhel/ovn-fedora.spec.in2
2 files changed, 4 insertions, 0 deletions
diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
index 9be31ada0..eec98485f 100644
--- a/rhel/openvswitch-fedora.spec.in
+++ b/rhel/openvswitch-fedora.spec.in
@@ -302,6 +302,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libovn*
%check
%if %{with check}
+ touch resolv.conf
+ export OVS_RESOLV_CONF=$(pwd)/resolv.conf
if make check TESTSUITEFLAGS='%{_smp_mflags}' RECHECK=yes; then :;
else
cat tests/testsuite.log
diff --git a/rhel/ovn-fedora.spec.in b/rhel/ovn-fedora.spec.in
index 15f3352ca..ea44e49cc 100644
--- a/rhel/ovn-fedora.spec.in
+++ b/rhel/ovn-fedora.spec.in
@@ -212,6 +212,8 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/openvswitch
%check
%if %{with check}
+ touch resolv.conf
+ export OVS_RESOLV_CONF=$(pwd)/resolv.conf
if make check TESTSUITEFLAGS='%{_smp_mflags}' RECHECK=yes; then :;
else
cat tests/testsuite.log