Merge branch 'rpm-centos8' into 'master'

distro/rpm: make spec centos8 compatible

See merge request !973

.gitlab-ci.yml

@@ -564,6 +564,13 @@ obs:centos7:x86_64:
     DISTROTEST_NAME: centos7
     DISTROTEST_REPO: CentOS_7_EPEL
 
+obs:centos8:x86_64:
+  <<: *distrotest
+  variables:
+    OBS_REPO: knot-resolver-latest
+    DISTROTEST_NAME: centos8
+    DISTROTEST_REPO: CentOS_8_EPEL
+
 obs:debian9:x86_64:
   <<: *distrotest
   only:

distro/rpm/knot-resolver.spec

@@ -18,7 +18,7 @@ URL:            https://www.knot-resolver.cz/
 Source0:        knot-resolver_%{version}.orig.tar.xz
 
 # LuaJIT only on these arches
-%if 0%{?rhel}
+%if 0%{?rhel} == 7
 # RHEL 7 does not have aarch64 LuaJIT
 ExclusiveArch:	%{ix86} x86_64
 %else
@@ -54,7 +54,7 @@ Requires:       systemd
 Requires(post): systemd
 
 # Distro-dependent dependencies
-%if 0%{?rhel}
+%if 0%{?rhel} == 7
 BuildRequires:  lmdb-devel
 # Lua 5.1 version of the libraries have different package names
 Requires:       lua-basexx
@@ -62,7 +62,7 @@ Requires:       lua-psl
 Requires:       lua-http
 Requires(pre):  shadow-utils
 %endif
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
 BuildRequires:  pkgconfig(lmdb)
 BuildRequires:  python3-sphinx
 Requires:       lua5.1-basexx
@@ -86,8 +86,9 @@ Requires(pre):  shadow
 
 %if "x%{?rhel}" == "x"
 # dependencies for doc package
-# NOTE: doc isn't possible to build on CentOS 7
-#       python2-sphinx is too old and python36-breathe is broken
+# NOTE: doc isn't possible to build on CentOS 7, 8
+#       python2-sphinx is too old and python36-breathe is broken on CentOS 7
+#       python3-breathe isn't available for CentOS 8 (yet? rhbz#1808766)
 BuildRequires:  doxygen
 BuildRequires:  python3-breathe
 BuildRequires:  python3-sphinx_rtd_theme
@@ -124,7 +125,7 @@ Documentation for Knot Resolver
 %package module-http
 Summary:        HTTP/2 module for Knot Resolver
 Requires:       %{name} = %{version}-%{release}
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
 Requires:       lua5.1-http
 Requires:       lua5.1-mmdb
 %else
@@ -191,8 +192,8 @@ rm %{buildroot}%{_libdir}/knot-resolver/kres_modules/http*.lua
 rm %{buildroot}%{_libdir}/knot-resolver/kres_modules/prometheus.lua
 %endif
 
-# rename doc directory for centos, opensuse
-%if "x%{?fedora}" == "x"
+# rename doc directory for centos 7, opensuse
+%if 0%{?suse_version} || 0%{?rhel} == 7
 install -m 755 -d %{buildroot}/%{_pkgdocdir}
 mv %{buildroot}/%{_datadir}/doc/%{name}/* %{buildroot}/%{_pkgdocdir}/
 %endif

distro/tests/centos8/Vagrantfile

+# SPDX-License-Identifier: GPL-3.0-or-later
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+
+Vagrant.configure(2) do |config|
+
+    config.vm.box = "centos/8"
+    config.vm.synced_folder ".", "/vagrant", disabled: true
+
+    config.vm.define "centos8_knot-resolver"  do |machine|
+        machine.vm.provision "ansible" do |ansible|
+            ansible.playbook = "../knot-resolver-pkgtest.yaml"
+            ansible.extra_vars = {
+                ansible_python_interpreter: "/usr/libexec/platform-python"
+            }
+        end
+    end
+
+    config.vm.provider :libvirt do |libvirt|
+      libvirt.cpus = 1
+      libvirt.memory = 1024
+    end
+
+    config.vm.provider :virtualbox do |vbox|
+      vbox.cpus = 1
+      vbox.memory = 1024
+    end
+
+end

distro/tests/centos8/ansible.cfg

+../.ansible.cfg
\ No newline at end of file