From 47a0e242764c15f7ba1833ef9e1e4b8fcf660715 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 10 Feb 2025 14:29:37 +0000 Subject: [PATCH 01/10] Update to 1.14.0 upstream release Upstream tag: v1.14.0 Upstream commit: 423ee203 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 ++ README.packit | 2 +- aardvark-dns.spec | 2 +- sources | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 43728e4..a7999de 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ /aardvark-dns-v1.13.0-vendor.tar.gz /v1.13.1.tar.gz /aardvark-dns-v1.13.1-vendor.tar.gz +/v1.14.0.tar.gz +/aardvark-dns-v1.14.0-vendor.tar.gz diff --git a/README.packit b/README.packit index 1b4760d..7017e6c 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.102.2.post1.dev4+g3142fcf8. +The file was generated using packit 1.1.0.post1.dev2+gf7b527d0. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index 85b901a..da9579f 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -22,7 +22,7 @@ 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.13.1 +Version: 1.14.0 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND MIT AND Zlib Release: %autorelease diff --git a/sources b/sources index f63296e..6221c50 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.13.1.tar.gz) = 30265a8d134f600e52c4a412a5fa9b00313cef26ad019adf5233ed0a63cd108b5636e15322569b1bd609d6eb741ceca94f3a076b391aef7ef0d47e3ae7e7c9ad -SHA512 (aardvark-dns-v1.13.1-vendor.tar.gz) = b5d5850409b54e74627b143669313dce35c94ea34533c6a89ea2d16e3155fe8030d406674fed8adbe9be9da6a71c5773d63382bde4364981adcfdbc036f515ac +SHA512 (v1.14.0.tar.gz) = 0300c474bb748063bf96488c06920df15ade525a8ee288446d3f30c3cffdccd687744efbb76e54a6b2213c38c02b00400ad79459bd78e8721556ff8dcdc1df8e +SHA512 (aardvark-dns-v1.14.0-vendor.tar.gz) = 0d738d0a737bfc9b6b2fe728de343a6a91c6e197d888fd37c0859b831b05f8c92efce13c268fc8f31a09bb78d43f4330230a0454744523df5a4fa96498ca3dac From 67bdd917e916c559827c7b32efca8a6e3ff46063 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 10 Feb 2025 14:30:17 +0000 Subject: [PATCH 02/10] Update to 1.14.0 upstream release Upstream tag: v1.14.0 Upstream commit: 423ee203 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 ++ README.packit | 2 +- aardvark-dns.spec | 2 +- sources | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 43728e4..a7999de 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ /aardvark-dns-v1.13.0-vendor.tar.gz /v1.13.1.tar.gz /aardvark-dns-v1.13.1-vendor.tar.gz +/v1.14.0.tar.gz +/aardvark-dns-v1.14.0-vendor.tar.gz diff --git a/README.packit b/README.packit index 1b4760d..7017e6c 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.102.2.post1.dev4+g3142fcf8. +The file was generated using packit 1.1.0.post1.dev2+gf7b527d0. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index 85b901a..da9579f 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -22,7 +22,7 @@ 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.13.1 +Version: 1.14.0 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND MIT AND Zlib Release: %autorelease diff --git a/sources b/sources index f63296e..6221c50 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.13.1.tar.gz) = 30265a8d134f600e52c4a412a5fa9b00313cef26ad019adf5233ed0a63cd108b5636e15322569b1bd609d6eb741ceca94f3a076b391aef7ef0d47e3ae7e7c9ad -SHA512 (aardvark-dns-v1.13.1-vendor.tar.gz) = b5d5850409b54e74627b143669313dce35c94ea34533c6a89ea2d16e3155fe8030d406674fed8adbe9be9da6a71c5773d63382bde4364981adcfdbc036f515ac +SHA512 (v1.14.0.tar.gz) = 0300c474bb748063bf96488c06920df15ade525a8ee288446d3f30c3cffdccd687744efbb76e54a6b2213c38c02b00400ad79459bd78e8721556ff8dcdc1df8e +SHA512 (aardvark-dns-v1.14.0-vendor.tar.gz) = 0d738d0a737bfc9b6b2fe728de343a6a91c6e197d888fd37c0859b831b05f8c92efce13c268fc8f31a09bb78d43f4330230a0454744523df5a4fa96498ca3dac From df26b36a6e1d6584986caba8d36cae6054f23f1e Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 13 May 2025 15:33:04 +0000 Subject: [PATCH 03/10] Update to 1.15.0 upstream release Upstream tag: v1.15.0 Upstream commit: d71294ce Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 ++ .packit.yaml | 23 ++++++++----------- README.packit | 2 +- aardvark-dns.spec | 30 ++++++++++++++++++++++++- gating.yaml | 8 +++++-- plans/main.fmf | 38 ++++++++++++++++++++------------ sources | 4 ++-- test/tmt/tmt/main.fmf | 26 ++++++++++++++++++++++ test/tmt/tmt/test_integration.sh | 8 +++++++ 9 files changed, 107 insertions(+), 34 deletions(-) create mode 100644 test/tmt/tmt/main.fmf create mode 100644 test/tmt/tmt/test_integration.sh diff --git a/.gitignore b/.gitignore index a7999de..90851e7 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,5 @@ /aardvark-dns-v1.13.1-vendor.tar.gz /v1.14.0.tar.gz /aardvark-dns-v1.14.0-vendor.tar.gz +/v1.15.0.tar.gz +/aardvark-dns-v1.15.0-vendor.tar.gz diff --git a/.packit.yaml b/.packit.yaml index e3e0afc..42b0f7d 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -16,6 +16,11 @@ files_to_sync: - src: plans/ dest: plans/ delete: true + mkpath: true + - src: test/tmt + dest: test/tmt + delete: true + mkpath: true - src: .fmf/ dest: .fmf/ delete: true @@ -43,7 +48,7 @@ jobs: notifications: &copr_build_failure_notification failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." - targets: + targets: &fedora_copr_targets - fedora-all-x86_64 - fedora-all-aarch64 enable_net: true @@ -85,29 +90,21 @@ jobs: project: podman-next enable_net: true - # Unit tests on Fedora + # Tests on Fedora - job: tests trigger: pull_request packages: [aardvark-dns-fedora] notifications: &test_failure_notification failure_comment: message: "Tests failed. @containers/packit-build please check." - targets: - - fedora-development-x86_64 - - fedora-development-aarch64 - - fedora-latest-x86_64 - - fedora-latest-aarch64 - - fedora-latest-stable-x86_64 - - fedora-latest-stable-aarch64 - - fedora-40-x86_64 - - fedora-40-aarch64 + targets: *fedora_copr_targets tf_extra_params: environments: - artifacts: - type: repository-file id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo - # Unit tests on CentOS Stream + # Tests on CentOS Stream - job: tests trigger: pull_request packages: [aardvark-dns-centos] @@ -118,8 +115,6 @@ jobs: - artifacts: - type: repository-file id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/centos-stream-$releasever/rhcontainerbot-podman-next-centos-stream-$releasever.repo - - type: repository-file - id: https://src.fedoraproject.org/rpms/epel-release/raw/epel$releasever/f/epel.repo # Sync to Fedora - job: propose_downstream diff --git a/README.packit b/README.packit index 7017e6c..807ffc6 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.1.0.post1.dev2+gf7b527d0. +The file was generated using packit 1.6.0.post1.dev2+gd5a7662a. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index da9579f..0bc518d 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -22,7 +22,7 @@ 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.15.0 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND MIT AND Zlib Release: %autorelease @@ -53,6 +53,23 @@ 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} +Requires: bats +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 +95,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,5 +112,8 @@ tar fx %{SOURCE1} %dir %{_libexecdir}/podman %{_libexecdir}/podman/%{name} +%files tests +%{_datadir}/%{name}/test + %changelog %autochangelog diff --git a/gating.yaml b/gating.yaml index dbb1d91..1fb3172 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,7 +1,10 @@ --- !Policy product_versions: - fedora-* -decision_context: bodhi_update_push_stable +decision_contexts: + - bodhi_update_push_stable + - bodhi_update_push_testing +subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} @@ -9,4 +12,5 @@ rules: product_versions: - rhel-* decision_context: osci_compose_gate -rules: [] +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/plans/main.fmf b/plans/main.fmf index 5f468c5..2b884e7 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -2,22 +2,32 @@ discover: how: fmf execute: how: tmt +prepare: + - when: distro == centos-stream or distro == rhel + how: shell + script: | + dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(rpm --eval '%{?rhel}').noarch.rpm + dnf -y config-manager --set-enabled epel + order: 10 + - when: initiator == packit + how: shell + script: | + COPR_REPO_FILE="/etc/yum.repos.d/*podman-next*.repo" + if compgen -G $COPR_REPO_FILE > /dev/null; then + sed -i -n '/^priority=/!p;$apriority=1' $COPR_REPO_FILE + fi + dnf -y upgrade --allowerasing + order: 20 -/upstream: - summary: Run tests on upstream PRs +/no-rpm: + summary: Run tests independent of rpm discover+: - filter: tag:upstream + filter: tag:no-rpm adjust+: - enabled: false - when: initiator is not defined or initiator != packit + - enabled: false + when: initiator is not defined or initiator != packit -/downstream: - summary: Run tests on bodhi / errata and dist-git PRs +/rpm: + summary: Run tests on the rpm discover+: - filter: tag:downstream - dist-git-install-builddeps: true - dist-git-source: true - dist-git-remove-fmf-root: true - adjust+: - enabled: false - when: initiator == packit + filter: tag:rpm diff --git a/sources b/sources index 6221c50..17a2977 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.14.0.tar.gz) = 0300c474bb748063bf96488c06920df15ade525a8ee288446d3f30c3cffdccd687744efbb76e54a6b2213c38c02b00400ad79459bd78e8721556ff8dcdc1df8e -SHA512 (aardvark-dns-v1.14.0-vendor.tar.gz) = 0d738d0a737bfc9b6b2fe728de343a6a91c6e197d888fd37c0859b831b05f8c92efce13c268fc8f31a09bb78d43f4330230a0454744523df5a4fa96498ca3dac +SHA512 (v1.15.0.tar.gz) = 0f77cfa09cb2c93d6750c114aff9a8efa1becd75da366b95b04a81ccecb2b00884d4cba61061b80f2a747f40fe619080f077559efb7dcc2b37c6334f4d02dbe3 +SHA512 (aardvark-dns-v1.15.0-vendor.tar.gz) = fbe6e77a2d412ed34bcf2c710db3aa8989a5887ab475988c393fb1c49584cac5b09a34b82e880eebe81c59af7817985af87391ffb8421da07abf080704cae5c0 diff --git a/test/tmt/tmt/main.fmf b/test/tmt/tmt/main.fmf new file mode 100644 index 0000000..9210cc8 --- /dev/null +++ b/test/tmt/tmt/main.fmf @@ -0,0 +1,26 @@ +/validate: + tag: [ no-rpm, validate ] + summary: Validate test + test: make -C ../.. validate + require: + - clippy + - rustfmt + +/unit: + tag: [ no-rpm, unit ] + summary: Unit tests + test: make -C ../.. unit + require: + - cargo + +/integration: + tag: [ rpm, integration ] + summary: Integration tests + test: bash test_integration.sh + environment: + AARDVARK: /usr/libexec/podman/aardvark-dns + require: + - aardvark-dns-tests + adjust: + duration: 10m + when: arch == aarch64 diff --git a/test/tmt/tmt/test_integration.sh b/test/tmt/tmt/test_integration.sh new file mode 100644 index 0000000..0839800 --- /dev/null +++ b/test/tmt/tmt/test_integration.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +set -exo pipefail + +rpm -q aardvark-dns aardvark-dns-tests netavark + +cd /usr/share/aardvark-dns/ +bats test/ From daceeab857a75d13cb8ccdf13eba4a16aca355a9 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 13 May 2025 15:33:31 +0000 Subject: [PATCH 04/10] Update to 1.15.0 upstream release Upstream tag: v1.15.0 Upstream commit: d71294ce Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 ++ .packit.yaml | 23 ++++++++----------- README.packit | 2 +- aardvark-dns.spec | 30 ++++++++++++++++++++++++- gating.yaml | 8 +++++-- plans/main.fmf | 38 ++++++++++++++++++++------------ sources | 4 ++-- test/tmt/tmt/main.fmf | 26 ++++++++++++++++++++++ test/tmt/tmt/test_integration.sh | 8 +++++++ 9 files changed, 107 insertions(+), 34 deletions(-) create mode 100644 test/tmt/tmt/main.fmf create mode 100644 test/tmt/tmt/test_integration.sh diff --git a/.gitignore b/.gitignore index a7999de..90851e7 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,5 @@ /aardvark-dns-v1.13.1-vendor.tar.gz /v1.14.0.tar.gz /aardvark-dns-v1.14.0-vendor.tar.gz +/v1.15.0.tar.gz +/aardvark-dns-v1.15.0-vendor.tar.gz diff --git a/.packit.yaml b/.packit.yaml index e3e0afc..42b0f7d 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -16,6 +16,11 @@ files_to_sync: - src: plans/ dest: plans/ delete: true + mkpath: true + - src: test/tmt + dest: test/tmt + delete: true + mkpath: true - src: .fmf/ dest: .fmf/ delete: true @@ -43,7 +48,7 @@ jobs: notifications: &copr_build_failure_notification failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." - targets: + targets: &fedora_copr_targets - fedora-all-x86_64 - fedora-all-aarch64 enable_net: true @@ -85,29 +90,21 @@ jobs: project: podman-next enable_net: true - # Unit tests on Fedora + # Tests on Fedora - job: tests trigger: pull_request packages: [aardvark-dns-fedora] notifications: &test_failure_notification failure_comment: message: "Tests failed. @containers/packit-build please check." - targets: - - fedora-development-x86_64 - - fedora-development-aarch64 - - fedora-latest-x86_64 - - fedora-latest-aarch64 - - fedora-latest-stable-x86_64 - - fedora-latest-stable-aarch64 - - fedora-40-x86_64 - - fedora-40-aarch64 + targets: *fedora_copr_targets tf_extra_params: environments: - artifacts: - type: repository-file id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo - # Unit tests on CentOS Stream + # Tests on CentOS Stream - job: tests trigger: pull_request packages: [aardvark-dns-centos] @@ -118,8 +115,6 @@ jobs: - artifacts: - type: repository-file id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/centos-stream-$releasever/rhcontainerbot-podman-next-centos-stream-$releasever.repo - - type: repository-file - id: https://src.fedoraproject.org/rpms/epel-release/raw/epel$releasever/f/epel.repo # Sync to Fedora - job: propose_downstream diff --git a/README.packit b/README.packit index 7017e6c..807ffc6 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.1.0.post1.dev2+gf7b527d0. +The file was generated using packit 1.6.0.post1.dev2+gd5a7662a. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index da9579f..0bc518d 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -22,7 +22,7 @@ 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.15.0 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND MIT AND Zlib Release: %autorelease @@ -53,6 +53,23 @@ 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} +Requires: bats +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 +95,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,5 +112,8 @@ tar fx %{SOURCE1} %dir %{_libexecdir}/podman %{_libexecdir}/podman/%{name} +%files tests +%{_datadir}/%{name}/test + %changelog %autochangelog diff --git a/gating.yaml b/gating.yaml index dbb1d91..1fb3172 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,7 +1,10 @@ --- !Policy product_versions: - fedora-* -decision_context: bodhi_update_push_stable +decision_contexts: + - bodhi_update_push_stable + - bodhi_update_push_testing +subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} @@ -9,4 +12,5 @@ rules: product_versions: - rhel-* decision_context: osci_compose_gate -rules: [] +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/plans/main.fmf b/plans/main.fmf index 5f468c5..2b884e7 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -2,22 +2,32 @@ discover: how: fmf execute: how: tmt +prepare: + - when: distro == centos-stream or distro == rhel + how: shell + script: | + dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(rpm --eval '%{?rhel}').noarch.rpm + dnf -y config-manager --set-enabled epel + order: 10 + - when: initiator == packit + how: shell + script: | + COPR_REPO_FILE="/etc/yum.repos.d/*podman-next*.repo" + if compgen -G $COPR_REPO_FILE > /dev/null; then + sed -i -n '/^priority=/!p;$apriority=1' $COPR_REPO_FILE + fi + dnf -y upgrade --allowerasing + order: 20 -/upstream: - summary: Run tests on upstream PRs +/no-rpm: + summary: Run tests independent of rpm discover+: - filter: tag:upstream + filter: tag:no-rpm adjust+: - enabled: false - when: initiator is not defined or initiator != packit + - enabled: false + when: initiator is not defined or initiator != packit -/downstream: - summary: Run tests on bodhi / errata and dist-git PRs +/rpm: + summary: Run tests on the rpm discover+: - filter: tag:downstream - dist-git-install-builddeps: true - dist-git-source: true - dist-git-remove-fmf-root: true - adjust+: - enabled: false - when: initiator == packit + filter: tag:rpm diff --git a/sources b/sources index 6221c50..17a2977 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.14.0.tar.gz) = 0300c474bb748063bf96488c06920df15ade525a8ee288446d3f30c3cffdccd687744efbb76e54a6b2213c38c02b00400ad79459bd78e8721556ff8dcdc1df8e -SHA512 (aardvark-dns-v1.14.0-vendor.tar.gz) = 0d738d0a737bfc9b6b2fe728de343a6a91c6e197d888fd37c0859b831b05f8c92efce13c268fc8f31a09bb78d43f4330230a0454744523df5a4fa96498ca3dac +SHA512 (v1.15.0.tar.gz) = 0f77cfa09cb2c93d6750c114aff9a8efa1becd75da366b95b04a81ccecb2b00884d4cba61061b80f2a747f40fe619080f077559efb7dcc2b37c6334f4d02dbe3 +SHA512 (aardvark-dns-v1.15.0-vendor.tar.gz) = fbe6e77a2d412ed34bcf2c710db3aa8989a5887ab475988c393fb1c49584cac5b09a34b82e880eebe81c59af7817985af87391ffb8421da07abf080704cae5c0 diff --git a/test/tmt/tmt/main.fmf b/test/tmt/tmt/main.fmf new file mode 100644 index 0000000..9210cc8 --- /dev/null +++ b/test/tmt/tmt/main.fmf @@ -0,0 +1,26 @@ +/validate: + tag: [ no-rpm, validate ] + summary: Validate test + test: make -C ../.. validate + require: + - clippy + - rustfmt + +/unit: + tag: [ no-rpm, unit ] + summary: Unit tests + test: make -C ../.. unit + require: + - cargo + +/integration: + tag: [ rpm, integration ] + summary: Integration tests + test: bash test_integration.sh + environment: + AARDVARK: /usr/libexec/podman/aardvark-dns + require: + - aardvark-dns-tests + adjust: + duration: 10m + when: arch == aarch64 diff --git a/test/tmt/tmt/test_integration.sh b/test/tmt/tmt/test_integration.sh new file mode 100644 index 0000000..0839800 --- /dev/null +++ b/test/tmt/tmt/test_integration.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +set -exo pipefail + +rpm -q aardvark-dns aardvark-dns-tests netavark + +cd /usr/share/aardvark-dns/ +bats test/ From 913f3a45e526207fd1de0183194c699b69879adf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:41:16 +0000 Subject: [PATCH 05/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 2d05fdebb5bbfc6462af3d493ccd88bd59005a30 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 14 Aug 2025 18:16:22 +0000 Subject: [PATCH 06/10] Update to 1.16.0 upstream release Upstream tag: v1.16.0 Upstream commit: 56db1e0c Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 ++ README.packit | 2 +- aardvark-dns.spec | 2 +- sources | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 90851e7..802337b 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,5 @@ /aardvark-dns-v1.14.0-vendor.tar.gz /v1.15.0.tar.gz /aardvark-dns-v1.15.0-vendor.tar.gz +/v1.16.0.tar.gz +/aardvark-dns-v1.16.0-vendor.tar.gz diff --git a/README.packit b/README.packit index 807ffc6..3ad54d6 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.6.0.post1.dev2+gd5a7662a. +The file was generated using packit 1.11.0. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index 0bc518d..70ae11b 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -22,7 +22,7 @@ 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.15.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: %autorelease diff --git a/sources b/sources index 17a2977..164c3ca 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.15.0.tar.gz) = 0f77cfa09cb2c93d6750c114aff9a8efa1becd75da366b95b04a81ccecb2b00884d4cba61061b80f2a747f40fe619080f077559efb7dcc2b37c6334f4d02dbe3 -SHA512 (aardvark-dns-v1.15.0-vendor.tar.gz) = fbe6e77a2d412ed34bcf2c710db3aa8989a5887ab475988c393fb1c49584cac5b09a34b82e880eebe81c59af7817985af87391ffb8421da07abf080704cae5c0 +SHA512 (v1.16.0.tar.gz) = 6acdc06856e88f582f3eb651463dc627b4f33fe78605725f500ba21bd74385fe76bf2cb29adec356618a15b2f288b844e38cbd18c4522f7748b29c6d0ab7f59a +SHA512 (aardvark-dns-v1.16.0-vendor.tar.gz) = 60e31efef6b37f5856d59931372971134707d82794d1fbc2fc2e446bc079efa975dfe00c4c21813502cbab70a1caa58eee38a06b5927f155df80a1232ed4f917 From 1702e377199c9923bce5935c45648eaaabe7cfa7 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 14 Aug 2025 18:16:39 +0000 Subject: [PATCH 07/10] Update to 1.16.0 upstream release Upstream tag: v1.16.0 Upstream commit: 56db1e0c Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 ++ README.packit | 2 +- aardvark-dns.spec | 2 +- sources | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 90851e7..802337b 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,5 @@ /aardvark-dns-v1.14.0-vendor.tar.gz /v1.15.0.tar.gz /aardvark-dns-v1.15.0-vendor.tar.gz +/v1.16.0.tar.gz +/aardvark-dns-v1.16.0-vendor.tar.gz diff --git a/README.packit b/README.packit index 807ffc6..3ad54d6 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.6.0.post1.dev2+gd5a7662a. +The file was generated using packit 1.11.0. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index 0bc518d..70ae11b 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -22,7 +22,7 @@ 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.15.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: %autorelease diff --git a/sources b/sources index 17a2977..164c3ca 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.15.0.tar.gz) = 0f77cfa09cb2c93d6750c114aff9a8efa1becd75da366b95b04a81ccecb2b00884d4cba61061b80f2a747f40fe619080f077559efb7dcc2b37c6334f4d02dbe3 -SHA512 (aardvark-dns-v1.15.0-vendor.tar.gz) = fbe6e77a2d412ed34bcf2c710db3aa8989a5887ab475988c393fb1c49584cac5b09a34b82e880eebe81c59af7817985af87391ffb8421da07abf080704cae5c0 +SHA512 (v1.16.0.tar.gz) = 6acdc06856e88f582f3eb651463dc627b4f33fe78605725f500ba21bd74385fe76bf2cb29adec356618a15b2f288b844e38cbd18c4522f7748b29c6d0ab7f59a +SHA512 (aardvark-dns-v1.16.0-vendor.tar.gz) = 60e31efef6b37f5856d59931372971134707d82794d1fbc2fc2e446bc079efa975dfe00c4c21813502cbab70a1caa58eee38a06b5927f155df80a1232ed4f917 From a840b54a294dcbb0dd8f92b46ab1ac1e339066b5 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 12 Nov 2025 15:19:24 +0000 Subject: [PATCH 08/10] Update to 1.17.0 upstream release Upstream tag: v1.17.0 Upstream commit: 2158073b Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 ++ .packit.yaml | 6 ++++++ README.packit | 2 +- aardvark-dns.spec | 6 +++--- sources | 4 ++-- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 802337b..edf038e 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ /aardvark-dns-v1.15.0-vendor.tar.gz /v1.16.0.tar.gz /aardvark-dns-v1.16.0-vendor.tar.gz +/v1.17.0.tar.gz +/aardvark-dns-v1.17.0-vendor.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 42b0f7d..89d1cee 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -38,9 +38,15 @@ packages: srpm_build_deps: - cargo + - git-archive-all - make - openssl-devel +# https://packit.dev/docs/configuration/actions +# fix-spec-file only operates on copr builds and doesn't affect official distro builds +actions: + fix-spec-file: "bash .packit-copr-rpm.sh" + jobs: - job: copr_build trigger: pull_request diff --git a/README.packit b/README.packit index 3ad54d6..e03362b 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.11.0. +The file was generated using packit 1.12.0.post1.dev13+gd51655c23. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index 70ae11b..08b71ac 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -22,7 +22,7 @@ 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.16.0 +Version: 1.17.0 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND MIT AND Zlib Release: %autorelease @@ -61,7 +61,7 @@ Requires: bats Requires: bind-utils Requires: jq Requires: netavark -Requires: nmap-ncat +Requires: socat Requires: dnsmasq %description tests @@ -97,7 +97,7 @@ tar fx %{SOURCE1} %{__install} -d -p %{buildroot}%{_datadir}/%{name}/test %{__cp} -rp test/* %{buildroot}%{_datadir}/%{name}/test/ -%{__rm} -rf %{buildroot}%{_datadir}/%{name}/test/tmt/ +%{__rm} -rf %{buildroot}%{_datadir}/%{name}/test/tmt/ # Add empty check section to silence rpmlint warning. # No tests meant to be run here. diff --git a/sources b/sources index 164c3ca..413dc03 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.16.0.tar.gz) = 6acdc06856e88f582f3eb651463dc627b4f33fe78605725f500ba21bd74385fe76bf2cb29adec356618a15b2f288b844e38cbd18c4522f7748b29c6d0ab7f59a -SHA512 (aardvark-dns-v1.16.0-vendor.tar.gz) = 60e31efef6b37f5856d59931372971134707d82794d1fbc2fc2e446bc079efa975dfe00c4c21813502cbab70a1caa58eee38a06b5927f155df80a1232ed4f917 +SHA512 (v1.17.0.tar.gz) = 42e3a261bb5b9df83b8bb853ed50dd7dfda643895262aedf5ccdc865c598e913996a244d234ac309a18ee1a884b7ba847679dfe5d8b6521e674114c8aba552da +SHA512 (aardvark-dns-v1.17.0-vendor.tar.gz) = b7ec2a2a34d5bb36dbcc55611dc9ec0ff2c1bed4469cc4b12d4eb0bd78bb7d6cae6f80a02ac32ade5c435fdd11e22ddd99646aa4de504c8369ee56cfa470e6a5 From 138627e247024597a9272a3b92c6d571cf223c7a Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 12 Nov 2025 15:20:16 +0000 Subject: [PATCH 09/10] Update to 1.17.0 upstream release Upstream tag: v1.17.0 Upstream commit: 2158073b Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 ++ .packit.yaml | 6 ++++++ README.packit | 2 +- aardvark-dns.spec | 6 +++--- sources | 4 ++-- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 802337b..edf038e 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ /aardvark-dns-v1.15.0-vendor.tar.gz /v1.16.0.tar.gz /aardvark-dns-v1.16.0-vendor.tar.gz +/v1.17.0.tar.gz +/aardvark-dns-v1.17.0-vendor.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 42b0f7d..89d1cee 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -38,9 +38,15 @@ packages: srpm_build_deps: - cargo + - git-archive-all - make - openssl-devel +# https://packit.dev/docs/configuration/actions +# fix-spec-file only operates on copr builds and doesn't affect official distro builds +actions: + fix-spec-file: "bash .packit-copr-rpm.sh" + jobs: - job: copr_build trigger: pull_request diff --git a/README.packit b/README.packit index 3ad54d6..e03362b 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.11.0. +The file was generated using packit 1.12.0.post1.dev13+gd51655c23. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index 70ae11b..08b71ac 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -22,7 +22,7 @@ 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.16.0 +Version: 1.17.0 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND MIT AND Zlib Release: %autorelease @@ -61,7 +61,7 @@ Requires: bats Requires: bind-utils Requires: jq Requires: netavark -Requires: nmap-ncat +Requires: socat Requires: dnsmasq %description tests @@ -97,7 +97,7 @@ tar fx %{SOURCE1} %{__install} -d -p %{buildroot}%{_datadir}/%{name}/test %{__cp} -rp test/* %{buildroot}%{_datadir}/%{name}/test/ -%{__rm} -rf %{buildroot}%{_datadir}/%{name}/test/tmt/ +%{__rm} -rf %{buildroot}%{_datadir}/%{name}/test/tmt/ # Add empty check section to silence rpmlint warning. # No tests meant to be run here. diff --git a/sources b/sources index 164c3ca..413dc03 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.16.0.tar.gz) = 6acdc06856e88f582f3eb651463dc627b4f33fe78605725f500ba21bd74385fe76bf2cb29adec356618a15b2f288b844e38cbd18c4522f7748b29c6d0ab7f59a -SHA512 (aardvark-dns-v1.16.0-vendor.tar.gz) = 60e31efef6b37f5856d59931372971134707d82794d1fbc2fc2e446bc079efa975dfe00c4c21813502cbab70a1caa58eee38a06b5927f155df80a1232ed4f917 +SHA512 (v1.17.0.tar.gz) = 42e3a261bb5b9df83b8bb853ed50dd7dfda643895262aedf5ccdc865c598e913996a244d234ac309a18ee1a884b7ba847679dfe5d8b6521e674114c8aba552da +SHA512 (aardvark-dns-v1.17.0-vendor.tar.gz) = b7ec2a2a34d5bb36dbcc55611dc9ec0ff2c1bed4469cc4b12d4eb0bd78bb7d6cae6f80a02ac32ade5c435fdd11e22ddd99646aa4de504c8369ee56cfa470e6a5 From ad694eb989045e7ff654498fefa3d6cc66d5e66a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:22:36 +0000 Subject: [PATCH 10/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild