diff --git a/.gitignore b/.gitignore index 491a6a5..654466b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -aardvark-dns-v1.14.0-vendor.tar.gz -v1.14.0.tar.gz +aardvark-dns-v1.16.0-vendor.tar.gz +v1.16.0.tar.gz diff --git a/aardvark-dns.spec b/aardvark-dns.spec index abe5af4..76e968c 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -10,6 +10,10 @@ %global debug_package %{nil} %endif +%if %{defined fedora} +%define requires_bats 1 +%endif + Name: aardvark-dns %if %{defined copr_username} Epoch: 102 @@ -22,10 +26,10 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.14.0 +Version: 1.16.0 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND MIT AND Zlib -Release: 1%{?dist} +Release: 2%{?dist} %if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} %else @@ -53,6 +57,27 @@ BuildRequires: rust-srpm-macros Forwards other request to configured resolvers. Read more about configuration in `src/backend/mod.rs`. +%package tests +Summary: Tests for %{name} + +Requires: %{name} = %{epoch}:%{version}-%{release} +%if %{defined requires_bats} +Requires: bats +%else +Recommends: bats +%endif +Requires: bind-utils +Requires: jq +Requires: netavark +Requires: nmap-ncat +Requires: dnsmasq + +%description tests +%{summary} + +This package contains system tests for %{name} and is only intended to be used +for gating tests. + %prep %autosetup -Sgit %{name}-%{version} # Following steps are only required on environments like koji which have no @@ -78,6 +103,14 @@ tar fx %{SOURCE1} %install %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install +%{__install} -d -p %{buildroot}%{_datadir}/%{name}/test +%{__cp} -rp test/* %{buildroot}%{_datadir}/%{name}/test/ +%{__rm} -rf %{buildroot}%{_datadir}/%{name}/test/tmt/ + +# Add empty check section to silence rpmlint warning. +# No tests meant to be run here. +%check + %files %license LICENSE %if (0%{?fedora} || 0%{?rhel} >= 10) && !%{defined copr_username} @@ -87,7 +120,30 @@ tar fx %{SOURCE1} %dir %{_libexecdir}/podman %{_libexecdir}/podman/%{name} +%files tests +%{_datadir}/%{name}/test + %changelog +* Fri Aug 15 2025 Jindrich Novy - 2:1.16.0-2 +- install BATS if it's not available +- Related: RHEL-80817 + +* Fri Aug 15 2025 Jindrich Novy - 2:1.16.0-1 +- update to https://github.com/containers/aardvark-dns/releases/tag/v1.16.0 +- Related: RHEL-80817 + +* Wed May 14 2025 Jindrich Novy - 2:1.15.0-1 +- update to https://github.com/containers/aardvark-dns/releases/tag/v1.15.0 +- Related: RHEL-80817 + +* Fri Mar 14 2025 Lokesh Mandvekar - 2:1.14.0-3 +- fix dep issues in tests subpackage +- Resolves: RHEL-80817 + +* Thu Feb 27 2025 Lokesh Mandvekar - 2:1.14.0-2 +- rebuilt to try TMT tests in osci +- Resolves: RHEL-80817 + * Mon Feb 10 2025 Jindrich Novy - 2:1.14.0-1 - update to https://github.com/containers/aardvark-dns/releases/tag/v1.14.0 - Related: RHEL-58990 diff --git a/sources b/sources index 6cb0151..ce89398 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (aardvark-dns-v1.14.0-vendor.tar.gz) = 0d738d0a737bfc9b6b2fe728de343a6a91c6e197d888fd37c0859b831b05f8c92efce13c268fc8f31a09bb78d43f4330230a0454744523df5a4fa96498ca3dac -SHA512 (v1.14.0.tar.gz) = 0300c474bb748063bf96488c06920df15ade525a8ee288446d3f30c3cffdccd687744efbb76e54a6b2213c38c02b00400ad79459bd78e8721556ff8dcdc1df8e +SHA512 (aardvark-dns-v1.16.0-vendor.tar.gz) = 60e31efef6b37f5856d59931372971134707d82794d1fbc2fc2e446bc079efa975dfe00c4c21813502cbab70a1caa58eee38a06b5927f155df80a1232ed4f917 +SHA512 (v1.16.0.tar.gz) = 6acdc06856e88f582f3eb651463dc627b4f33fe78605725f500ba21bd74385fe76bf2cb29adec356618a15b2f288b844e38cbd18c4522f7748b29c6d0ab7f59a