tests/packaging: add f32, remove f30

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dcff9cec823ba5fdbd10b967e304354dae72f4b6..d13c46c476030bcc162da55800e141a88892b2c8 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -485,10 +485,10 @@ packaging:fedora_31:
   variables:
     DISTRO: fedora_31
 
-packaging:fedora_30:
+packaging:fedora_32:
   <<: *packagingtest
   variables:
-    DISTRO: fedora_30
+    DISTRO: fedora_32
 
 packaging:leap_15.2:
   <<: *packagingtest

diff --git a/daemon/.packaging/fedora/30/builddeps b/daemon/.packaging/fedora/32/builddeps
similarity index 100%
rename from daemon/.packaging/fedora/30/builddeps
rename to daemon/.packaging/fedora/32/builddeps

diff --git a/daemon/.packaging/fedora/30/pre-build.sh b/daemon/.packaging/fedora/32/pre-build.sh
similarity index 59%
rename from daemon/.packaging/fedora/30/pre-build.sh
rename to daemon/.packaging/fedora/32/pre-build.sh
index e0a8e358afe7a31a3bf27413c43c84b5f07e0f97..97caeadfe9c4b03f3619c77424bc7f3c18659670 100755 (executable)
--- a/daemon/.packaging/fedora/30/pre-build.sh
+++ b/daemon/.packaging/fedora/32/pre-build.sh
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-dnf install -y wget 'dnf-command(config-manager)'
+dnf install -y wget
 
-dnf config-manager --add-repo https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-build/Fedora_30/home:CZ-NIC:knot-resolver-build.repo
+dnf config-manager --add-repo https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-build/Fedora_32/home:CZ-NIC:knot-resolver-build.repo
 dnf install -y knot
 dnf upgrade -y

diff --git a/daemon/.packaging/fedora/30/pre-run.sh b/daemon/.packaging/fedora/32/pre-run.sh
similarity index 56%
rename from daemon/.packaging/fedora/30/pre-run.sh
rename to daemon/.packaging/fedora/32/pre-run.sh
index 4a883a0ea6fc8ad6503a6697879bb137887e6eae..b224b7eb0fd7444bc71ba2d1aec51b3b85d1bd17 100755 (executable)
--- a/daemon/.packaging/fedora/30/pre-run.sh
+++ b/daemon/.packaging/fedora/32/pre-run.sh
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-dnf install -y wget 'dnf-command(config-manager)'
+dnf install -y wget
 
-dnf config-manager --add-repo https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-latest/Fedora_30/home:CZ-NIC:knot-resolver-latest.repo
+dnf config-manager --add-repo https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-latest/Fedora_32/home:CZ-NIC:knot-resolver-latest.repo
 dnf upgrade -y

diff --git a/daemon/.packaging/fedora/30/rundeps b/daemon/.packaging/fedora/32/rundeps
similarity index 100%
rename from daemon/.packaging/fedora/30/rundeps
rename to daemon/.packaging/fedora/32/rundeps

diff --git a/doc/.packaging/fedora/30/build.sh b/doc/.packaging/fedora/32/30/build.sh
similarity index 100%
rename from doc/.packaging/fedora/30/build.sh
rename to doc/.packaging/fedora/32/30/build.sh

diff --git a/doc/.packaging/fedora/30/builddeps b/doc/.packaging/fedora/32/30/builddeps
similarity index 100%
rename from doc/.packaging/fedora/30/builddeps
rename to doc/.packaging/fedora/32/30/builddeps

diff --git a/doc/.packaging/fedora/30/install.sh b/doc/.packaging/fedora/32/30/install.sh
similarity index 100%
rename from doc/.packaging/fedora/30/install.sh
rename to doc/.packaging/fedora/32/30/install.sh

diff --git a/doc/.packaging/fedora/32/build.sh b/doc/.packaging/fedora/32/build.sh
new file mode 100755 (executable)
index 0000000..68ea49e
--- /dev/null
+++ b/doc/.packaging/fedora/32/build.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-3.0-or-later
+[ -d /root/kresd/build_packaging ] && rm -rf /root/kresd/build_packaging/;
+CFLAGS="$CFLAGS -Wall -pedantic -fno-omit-frame-pointer"
+LDFLAGS="$LDFLAGS -Wl,--as-needed"
+meson build_packaging \
+       --buildtype=plain \
+       --prefix=/root/kresd/install_packaging \
+       --sbindir=sbin \
+       --libdir=lib \
+       --includedir=include \
+       --sysconfdir=etc \
+       -Ddoc=enabled \
+       -Dsystemd_files=enabled \
+       -Dclient=enabled \
+       -Dunit_tests=enabled \
+       -Dmanaged_ta=enabled \
+       -Dkeyfile_default=/var/lib/knot-resolver/root.keys \
+       -Dinstall_root_keys=enabled \
+       -Dinstall_kresd_conf=enabled;

diff --git a/doc/.packaging/fedora/32/builddeps b/doc/.packaging/fedora/32/builddeps
new file mode 100644 (file)
index 0000000..0a4b886
--- /dev/null
+++ b/doc/.packaging/fedora/32/builddeps
@@ -0,0 +1,4 @@
+doxygen
+python3-sphinx
+python3-breathe
+python3-sphinx_rtd_theme

diff --git a/doc/.packaging/fedora/32/install.sh b/doc/.packaging/fedora/32/install.sh
new file mode 100755 (executable)
index 0000000..3422d68
--- /dev/null
+++ b/doc/.packaging/fedora/32/install.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-3.0-or-later
+ninja -C build_packaging doc

diff --git a/modules/dnstap/.packaging/fedora/30/builddeps b/modules/dnstap/.packaging/fedora/32/builddeps
similarity index 100%
rename from modules/dnstap/.packaging/fedora/30/builddeps
rename to modules/dnstap/.packaging/fedora/32/builddeps

diff --git a/modules/dnstap/.packaging/fedora/30/rundeps b/modules/dnstap/.packaging/fedora/32/rundeps
similarity index 100%
rename from modules/dnstap/.packaging/fedora/30/rundeps
rename to modules/dnstap/.packaging/fedora/32/rundeps

diff --git a/modules/etcd/.packaging/fedora/30/NOTSUPPORTED b/modules/etcd/.packaging/fedora/32/NOTSUPPORTED
similarity index 100%
rename from modules/etcd/.packaging/fedora/30/NOTSUPPORTED
rename to modules/etcd/.packaging/fedora/32/NOTSUPPORTED

diff --git a/modules/experimental_dot_auth/.packaging/fedora/30/rundeps b/modules/experimental_dot_auth/.packaging/fedora/32/rundeps
similarity index 100%
rename from modules/experimental_dot_auth/.packaging/fedora/30/rundeps
rename to modules/experimental_dot_auth/.packaging/fedora/32/rundeps

diff --git a/modules/graphite/.packaging/fedora/30/rundeps b/modules/graphite/.packaging/fedora/32/rundeps
similarity index 100%
rename from modules/graphite/.packaging/fedora/30/rundeps
rename to modules/graphite/.packaging/fedora/32/rundeps

diff --git a/modules/http/.packaging/fedora/30/rundeps b/modules/http/.packaging/fedora/32/rundeps
similarity index 100%
rename from modules/http/.packaging/fedora/30/rundeps
rename to modules/http/.packaging/fedora/32/rundeps