From ae8535aa2dacbbef49d45765fc729abbef6b68b6 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Thu, 30 May 2024 15:37:57 +0000
Subject: [PATCH 01/18] Update to 1.11.0 upstream release

Upstream tag: v1.11.0
Upstream commit: 666d7b15

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore        |   2 +
 .packit.yaml      | 140 ++++++++++++++++++++++++++++++++++------------
 README.packit     |   2 +-
 aardvark-dns.spec |  10 +---
 sources           |   4 +-
 5 files changed, 109 insertions(+), 49 deletions(-)

diff --git a/.gitignore b/.gitignore
index afa8b52..776472d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,5 @@
 /aardvark-dns-v1.9.0-vendor.tar.gz
 /v1.10.0.tar.gz
 /aardvark-dns-v1.10.0-vendor.tar.gz
+/v1.11.0.tar.gz
+/aardvark-dns-v1.11.0-vendor.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
index 61e87f1..d13d559 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -2,9 +2,19 @@
 # See the documentation for more information:
 # https://packit.dev/docs/configuration/
 
-specfile_path: rpm/aardvark-dns.spec
+downstream_package_name: aardvark-dns
 upstream_tag_template: v{version}
 
+packages:
+  aardvark-dns-fedora:
+    pkg_tool: fedpkg
+    specfile_path: rpm/aardvark-dns.spec
+  aardvark-dns-centos:
+    pkg_tool: centpkg
+    specfile_path: rpm/aardvark-dns.spec
+  aardvark-dns-rhel:
+    specfile_path: rpm/aardvark-dns.spec
+
 srpm_build_deps:
   - cargo
   - make
@@ -13,7 +23,8 @@ srpm_build_deps:
 jobs:
   - job: copr_build
     trigger: pull_request
-    notifications:
+    packages: [aardvark-dns-fedora]
+    notifications: &copr_build_failure_notification
       failure_comment:
         message: "Ephemeral COPR build failed. @containers/packit-build please check."
     targets:
@@ -25,12 +36,26 @@ jobs:
       fedora-eln-aarch64:
         additional_repos:
           - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/aarch64/"
-      epel-8-x86_64: {}
-      epel-8-aarch64: {}
-      epel-9-x86_64: {}
-      epel-9-aarch64: {}
-    additional_repos:
-      - "copr://rhcontainerbot/podman-next"
+    enable_net: true
+
+  - job: copr_build
+    trigger: pull_request
+    packages: [aardvark-dns-centos]
+    notifications: *copr_build_failure_notification
+    targets:
+      - centos-stream-9-x86_64
+      - centos-stream-9-aarch64
+      - centos-stream-10-x86_64
+      - centos-stream-10-aarch64
+    enable_net: true
+
+  - job: copr_build
+    trigger: pull_request
+    packages: [aardvark-dns-rhel]
+    notifications: *copr_build_failure_notification
+    targets:
+      - epel-9-x86_64
+      - epel-9-aarch64
     enable_net: true
 
   # Run on commit to main branch
@@ -54,70 +79,111 @@ jobs:
     identifier: validate_test
     tmt_plan: "/plans/validate_test"
 
-  # Unit tests
+  # Unit tests on Fedora
   - job: tests
     trigger: pull_request
     skip_build: true
-    targets: &pr_test_targets
+    notifications: &unit_test_failure_notification
+      failure_comment:
+        message: "Unit tests failed. @containers/packit-build please check."
+    targets: &pr_test_targets_fedora
       - fedora-all-x86_64
       - fedora-all-aarch64
-      - epel-8-x86_64
-      - epel-8-aarch64
-      - epel-9-x86_64
-      - epel-9-aarch64
-    identifier: unit_test
+    identifier: unit_test_fedora
     tmt_plan: "/plans/unit_test"
 
-  # Integration tests
+  # Unit tests on CentOS Stream
   - job: tests
     trigger: pull_request
-    targets: *pr_test_targets
-    identifier: integration_test
-    tmt_plan: "/plans/integration_test"
+    skip_build: true
+    notifications: *unit_test_failure_notification
+    targets: &pr_test_targets_centos
+      - centos-stream-9-x86_64
+      - centos-stream-9-aarch64
+      # TODO: iptables kernel module is not available on rhel10.
+      # Enable these after netavark default is switched to nftables.
+      #- centos-stream-10-x86_64
+      #- centos-stream-10-aarch64
+    identifier: unit_test_centos
+    tmt_plan: "/plans/unit_test"
 
   # Unit tests on RHEL
   - job: tests
     trigger: pull_request
     skip_build: true
+    notifications: *unit_test_failure_notification
     use_internal_tf: true
-    notifications:
-      failure_comment:
-        message: "podman e2e tests failed on RHEL. @containers/packit-build please check."
     targets: &pr_test_targets_rhel
-      epel-8-aarch64:
-        distros: [RHEL-8.9.0-Nightly,RHEL-8.10.0-Nightly]
-      epel-8-x86_64:
-        distros: [RHEL-8.9.0-Nightly,RHEL-8.10.0-Nightly]
       epel-9-aarch64:
-        distros: [RHEL-9.3.0-Nightly,RHEL-9.4.0-Nightly]
+        distros: [RHEL-9-Nightly,RHEL-9.4.0-Nightly]
       epel-9-x86_64:
-        distros: [RHEL-9.3.0-Nightly,RHEL-9.4.0-Nightly]
-    identifier: unit_test_internal
+        distros: [RHEL-9-Nightly,RHEL-9.4.0-Nightly]
+      # NOTE: Need to use centos-stream-10 until RHEL-10/EPEL-10 copr targets
+      # are available
+      # TODO: iptables kernel module is not available on rhel10.
+      # Enable these after netavark default is switched to nftables.
+      #centos-stream-10-aarch64:
+      #  distros: [RHEL-10-Beta-Nightly]
+      #centos-stream-10-x86_64:
+      #  distros: [RHEL-10-Beta-Nightly]
+    identifier: unit_test_rhel
     tmt_plan: "/plans/unit_test"
 
+  # Integration tests on Fedora
+  - job: tests
+    trigger: pull_request
+    packages: [aardvark-dns-fedora]
+    notifications: &integration_test_failure_notification
+      failure_comment:
+        message: "Integration tests failed. @containers/packit-build please check."
+    targets: *pr_test_targets_fedora
+    identifier: integration_test_fedora
+    tmt_plan: "/plans/integration_test"
+
+  # Integration tests on CentOS Stream
+  - job: tests
+    trigger: pull_request
+    packages: [aardvark-dns-centos]
+    notifications: *integration_test_failure_notification
+    targets: *pr_test_targets_centos
+    identifier: integration_test_centos
+    tmt_plan: "/plans/integration_test"
+
   # Integration tests on RHEL
   - job: tests
     trigger: pull_request
+    packages: [aardvark-dns-rhel]
+    notifications: *integration_test_failure_notification
     use_internal_tf: true
-    notifications:
-      failure_comment:
-        message: "podman system tests failed on RHEL. @containers/packit-build please check."
     targets: *pr_test_targets_rhel
-    identifier: integration_test_internal
+    identifier: integration_test_rhel
     tmt_plan: "/plans/integration_test"
 
+  # Sync to Fedora
   - job: propose_downstream
     trigger: release
+    packages: [aardvark-dns-fedora]
     update_release: false
     dist_git_branches:
       - fedora-all
 
+  # Sync to CentOS Stream
+  - job: propose_downstream
+    trigger: release
+    packages: [aardvark-dns-centos]
+    update_release: false
+    dist_git_branches:
+      - c10s
+
   - job: koji_build
     trigger: commit
     dist_git_branches:
       - fedora-all
 
-  - job: bodhi_update
-    trigger: commit
-    dist_git_branches:
-      - fedora-branched # rawhide updates are created automatically
+        # NOTE: Bodhi update tasks are disabled to allow netavark and aardvark-dns X.Y
+        # builds in a single manual bodhi update. Leaving this commented out
+        # but not deleted so it's not forgotten.
+        #- job: bodhi_update
+        #trigger: commit
+        #dist_git_branches:
+        #- fedora-branched # rawhide updates are created automatically
diff --git a/README.packit b/README.packit
index bba9424..2fa216c 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.89.0.post1.dev4+gabf90471.
+The file was generated using packit 0.97.1.post1.dev4+g1268842e.
diff --git a/aardvark-dns.spec b/aardvark-dns.spec
index ef26893..b10a069 100644
--- a/aardvark-dns.spec
+++ b/aardvark-dns.spec
@@ -1,14 +1,6 @@
 # trust-dns-{client,server} not available
 # using vendored deps
 
-# RHEL doesn't include the package rust-packaging which provides %%__cargo macro, but EPEL
-# does. So we set it separately here and skip rust-packaging dependency for RHEL.
-# Buildability without EPEL is essential for packit builds.
-# ELN doesn't need this.
-%if %{defined rhel} && 0%{?rhel} < 10
-%define __cargo %{_bindir}/env CARGO_HOME=.cargo RUSTC_BOOTSTRAP=1 RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Clink-arg=-Wl,-z,relro -Clink-arg=-Wl,-z,now --cap-lints=warn' %{_bindir}/cargo
-%endif
-
 %global with_debug 1
 
 %if 0%{?with_debug}
@@ -28,7 +20,7 @@ Epoch: 102
 # 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.10.0
+Version: 1.11.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 7e0d26c..95b5cfe 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (v1.10.0.tar.gz) = 9ff315dc576f94bfc0affb6658bb47d9b7d448cf11294df607f7e8701662f148fb655f1eae6eb118f16b9e0779d27ab86d651883b1fd3bdc0e29c587bf47729b
-SHA512 (aardvark-dns-v1.10.0-vendor.tar.gz) = 68d0106b71f42ba789810020d62911d880debf90a35a086aabfd614403985025dc0c5934087a98943b53f6dfd8ede4add99465cec1ae9a098ff1de1082e1ef9c
+SHA512 (v1.11.0.tar.gz) = c8c7ecf98fa705ab6de9a7a63cbe8b0b1226fe145bdd7aca2d633504c930a0e02afab9665ee0175ea4a584300eaeecbf277e83e6cfdd8c0caeecade98c454b31
+SHA512 (aardvark-dns-v1.11.0-vendor.tar.gz) = e49a6bb410238b90287a75adee481b8fe899ff680be48831c9b3cf36f9985d1fec1ba5bb858a095ffd520c05888651163d65f8b038e7512e975cfa522c0bee56

From 4d693d5144f5e536d26cfded232c8b317347a8c6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 17 Jul 2024 16:28:41 +0000
Subject: [PATCH 02/18] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild


From 14f5d331e710676f6dd9c7fc83d51ce499bc3d7b Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@redhat.com>
Date: Fri, 26 Jul 2024 10:00:30 -0400
Subject: [PATCH 03/18] epoch: 2 on non-copr

---
 aardvark-dns.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/aardvark-dns.spec b/aardvark-dns.spec
index b10a069..ec9c821 100644
--- a/aardvark-dns.spec
+++ b/aardvark-dns.spec
@@ -13,6 +13,8 @@
 Name: aardvark-dns
 %if %{defined copr_username}
 Epoch: 102
+%else
+Epoch: 2
 %endif
 # DO NOT TOUCH the Version string!
 # The TRUE source of this specfile is:

From 2af607a4576c9bd3f12be619d38a25849ddbff56 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@redhat.com>
Date: Fri, 26 Jul 2024 10:39:44 -0400
Subject: [PATCH 04/18] rebuild


From 5d3e595eb626f1b1cab16ab90124663d4deed28c Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@redhat.com>
Date: Fri, 26 Jul 2024 10:39:46 -0400
Subject: [PATCH 05/18] rebuild


From 43998e7c071c16517cc87d11ba752223b2e67611 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Fri, 2 Aug 2024 13:32:40 -0400
Subject: [PATCH 06/18] bump to v1.12.1

---
 .gitignore        | 2 ++
 aardvark-dns.spec | 2 +-
 sources           | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 776472d..e5c5c66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,5 @@
 /aardvark-dns-v1.10.0-vendor.tar.gz
 /v1.11.0.tar.gz
 /aardvark-dns-v1.11.0-vendor.tar.gz
+/aardvark-dns-v1.12.1-vendor.tar.gz
+/v1.12.1.tar.gz
diff --git a/aardvark-dns.spec b/aardvark-dns.spec
index ec9c821..8f62ce1 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.11.0
+Version: 1.12.1
 # 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 95b5cfe..95eb2f7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (v1.11.0.tar.gz) = c8c7ecf98fa705ab6de9a7a63cbe8b0b1226fe145bdd7aca2d633504c930a0e02afab9665ee0175ea4a584300eaeecbf277e83e6cfdd8c0caeecade98c454b31
-SHA512 (aardvark-dns-v1.11.0-vendor.tar.gz) = e49a6bb410238b90287a75adee481b8fe899ff680be48831c9b3cf36f9985d1fec1ba5bb858a095ffd520c05888651163d65f8b038e7512e975cfa522c0bee56
+SHA512 (aardvark-dns-v1.12.1-vendor.tar.gz) = f4b7cfeface7c725201499f3a182ab1d3ad0aba9ad1fcfd364a8dc0684b31c42800c671e856f93634e71f1fb334121cf8dfc809f0e4a9bb14fe0cc493715dc43
+SHA512 (v1.12.1.tar.gz) = 63e10296b97791d23ae8714af99bc533bf01c4a584bc8bd9e2b935785a61eed58f96bb1e369fb46ed45dcc5ca0740fc3264315ad584a32212b49f5ee8e524881

From 1868b265e47246e824291915ea1c2a5668ac7cef Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Wed, 4 Sep 2024 13:55:48 +0000
Subject: [PATCH 07/18] Update to 1.12.2 upstream release

Upstream tag: v1.12.2
Upstream commit: 4034a243

Commit authored by Packit automation (https://packit.dev/)
---
 .fmf/version      |  1 +
 .gitignore        |  2 ++
 .packit.yaml      | 89 +++++++++++++++--------------------------------
 README.packit     |  2 +-
 aardvark-dns.spec | 25 +++++++------
 gating.yaml       | 12 +++++++
 plans/all.fmf     | 22 ++++++++++++
 sources           |  4 +--
 8 files changed, 84 insertions(+), 73 deletions(-)
 create mode 100644 .fmf/version
 create mode 100644 gating.yaml
 create mode 100644 plans/all.fmf

diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/.gitignore b/.gitignore
index e5c5c66..15bdafa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,5 @@
 /aardvark-dns-v1.11.0-vendor.tar.gz
 /aardvark-dns-v1.12.1-vendor.tar.gz
 /v1.12.1.tar.gz
+/v1.12.2.tar.gz
+/aardvark-dns-v1.12.2-vendor.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
index d13d559..d3ca1ec 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -5,6 +5,22 @@
 downstream_package_name: aardvark-dns
 upstream_tag_template: v{version}
 
+# These files get synced from upstream to downstream (Fedora / CentOS Stream) on every
+# propose-downstream job. This is done so tests maintained upstream can be run
+# downstream in Zuul CI and Bodhi.
+# Ref: https://packit.dev/docs/configuration#files_to_sync
+files_to_sync:
+  - src: rpm/gating.yaml
+    dest: gating.yaml
+    delete: true
+  - src: plans/
+    dest: plans/
+    delete: true
+  - src: .fmf/
+    dest: .fmf/
+    delete: true
+  - .packit.yaml
+
 packages:
   aardvark-dns-fedora:
     pkg_tool: fedpkg
@@ -61,6 +77,7 @@ jobs:
   # Run on commit to main branch
   - job: copr_build
     trigger: commit
+    packages: [aardvark-dns-fedora]
     notifications:
       failure_comment:
         message: "podman-next COPR build failed. @containers/packit-build please check."
@@ -69,51 +86,35 @@ jobs:
     project: podman-next
     enable_net: true
 
-  # Validate test
-  - job: tests
-    trigger: pull_request
-    skip_build: true
-    targets:
-      # Only need to test on one target
-      - fedora-latest-stable-x86_64
-    identifier: validate_test
-    tmt_plan: "/plans/validate_test"
-
   # Unit tests on Fedora
   - job: tests
     trigger: pull_request
-    skip_build: true
-    notifications: &unit_test_failure_notification
+    packages: [aardvark-dns-fedora]
+    notifications: &test_failure_notification
       failure_comment:
-        message: "Unit tests failed. @containers/packit-build please check."
-    targets: &pr_test_targets_fedora
+        message: "Tests failed. @containers/packit-build please check."
+    targets:
       - fedora-all-x86_64
       - fedora-all-aarch64
-    identifier: unit_test_fedora
-    tmt_plan: "/plans/unit_test"
 
   # Unit tests on CentOS Stream
   - job: tests
     trigger: pull_request
-    skip_build: true
-    notifications: *unit_test_failure_notification
-    targets: &pr_test_targets_centos
+    packages: [aardvark-dns-centos]
+    notifications: *test_failure_notification
+    targets:
       - centos-stream-9-x86_64
       - centos-stream-9-aarch64
-      # TODO: iptables kernel module is not available on rhel10.
-      # Enable these after netavark default is switched to nftables.
-      #- centos-stream-10-x86_64
-      #- centos-stream-10-aarch64
-    identifier: unit_test_centos
-    tmt_plan: "/plans/unit_test"
+      - centos-stream-10-x86_64
+      - centos-stream-10-aarch64
 
   # Unit tests on RHEL
   - job: tests
     trigger: pull_request
-    skip_build: true
-    notifications: *unit_test_failure_notification
+    packages: [aardvark-dns-rhel]
+    notifications: *test_failure_notification
     use_internal_tf: true
-    targets: &pr_test_targets_rhel
+    targets:
       epel-9-aarch64:
         distros: [RHEL-9-Nightly,RHEL-9.4.0-Nightly]
       epel-9-x86_64:
@@ -126,38 +127,6 @@ jobs:
       #  distros: [RHEL-10-Beta-Nightly]
       #centos-stream-10-x86_64:
       #  distros: [RHEL-10-Beta-Nightly]
-    identifier: unit_test_rhel
-    tmt_plan: "/plans/unit_test"
-
-  # Integration tests on Fedora
-  - job: tests
-    trigger: pull_request
-    packages: [aardvark-dns-fedora]
-    notifications: &integration_test_failure_notification
-      failure_comment:
-        message: "Integration tests failed. @containers/packit-build please check."
-    targets: *pr_test_targets_fedora
-    identifier: integration_test_fedora
-    tmt_plan: "/plans/integration_test"
-
-  # Integration tests on CentOS Stream
-  - job: tests
-    trigger: pull_request
-    packages: [aardvark-dns-centos]
-    notifications: *integration_test_failure_notification
-    targets: *pr_test_targets_centos
-    identifier: integration_test_centos
-    tmt_plan: "/plans/integration_test"
-
-  # Integration tests on RHEL
-  - job: tests
-    trigger: pull_request
-    packages: [aardvark-dns-rhel]
-    notifications: *integration_test_failure_notification
-    use_internal_tf: true
-    targets: *pr_test_targets_rhel
-    identifier: integration_test_rhel
-    tmt_plan: "/plans/integration_test"
 
   # Sync to Fedora
   - job: propose_downstream
diff --git a/README.packit b/README.packit
index 2fa216c..00daafb 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.97.1.post1.dev4+g1268842e.
+The file was generated using packit 0.100.3.post1.dev13+g92513a8e.
diff --git a/aardvark-dns.spec b/aardvark-dns.spec
index 8f62ce1..cb3efc6 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.12.1
+Version: 1.12.2
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND MIT AND Zlib
 Release: %autorelease
@@ -60,25 +60,30 @@ Read more about configuration in `src/backend/mod.rs`.
 # dependencies directly from the network.
 %if !%{defined copr_username}
 tar fx %{SOURCE1}
-mkdir -p .cargo
-
-cat >.cargo/config << EOF
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-directory = "vendor"
-EOF
+%if 0%{?fedora} || 0%{?rhel} >= 10
+%cargo_prep -v vendor
+%else
+%cargo_prep -V 1
+%endif
 %endif
 
 %build
 %{__make} CARGO="%{__cargo}" build
+%if (0%{?fedora} || 0%{?rhel} >= 10) && !%{defined copr_username}
+%cargo_license_summary
+%{cargo_license} > LICENSE.dependencies
+%cargo_vendor_manifest
+%endif
 
 %install
 %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 
 %files
 %license LICENSE
+%if (0%{?fedora} || 0%{?rhel} >= 10) && !%{defined copr_username}
+%license LICENSE.dependencies
+%license cargo-vendor.txt
+%endif
 %dir %{_libexecdir}/podman
 %{_libexecdir}/podman/%{name}
 
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..dbb1d91
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,12 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+
+--- !Policy
+product_versions:
+  - rhel-*
+decision_context: osci_compose_gate
+rules: []
diff --git a/plans/all.fmf b/plans/all.fmf
new file mode 100644
index 0000000..6413ecf
--- /dev/null
+++ b/plans/all.fmf
@@ -0,0 +1,22 @@
+discover:
+    how: fmf
+execute:
+    how: tmt
+
+/upstream:
+    summary: Run tests on upstream PRs
+    discover+:
+        filter: tag:upstream
+    adjust+:
+        enabled: false
+        when: initiator is not defined or initiator != packit
+
+/downstream:
+    summary: Run tests on bodhi / errata and dist-git PRs
+    discover+:
+        filter: tag:downstream
+        dist-git-source: true
+        dist-git-remove-fmf-root: true
+    adjust+:
+        enabled: false
+        when: initiator == packit
diff --git a/sources b/sources
index 95eb2f7..5be99cc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (aardvark-dns-v1.12.1-vendor.tar.gz) = f4b7cfeface7c725201499f3a182ab1d3ad0aba9ad1fcfd364a8dc0684b31c42800c671e856f93634e71f1fb334121cf8dfc809f0e4a9bb14fe0cc493715dc43
-SHA512 (v1.12.1.tar.gz) = 63e10296b97791d23ae8714af99bc533bf01c4a584bc8bd9e2b935785a61eed58f96bb1e369fb46ed45dcc5ca0740fc3264315ad584a32212b49f5ee8e524881
+SHA512 (v1.12.2.tar.gz) = 851683cd5ac569358c0f89895879c19ac607653f2f4578030a99911a4723dab025ca6d26615da6037baf95514e9bb7d3a2c86c618d57c67cee2b28fd3a73c072
+SHA512 (aardvark-dns-v1.12.2-vendor.tar.gz) = 1dfacc29962acca5c7baa11fbe4d1c93276b91cb5e1db6033d8e23e963ca4c4098bdbf4bdf89730fdea4d5a45b3a2c00ee65888d502e8009d2adaaa6f8374dba

From 5716cbb68b57f0b9cfa7af6f841922620b63af28 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Thu, 5 Sep 2024 17:10:13 +0530
Subject: [PATCH 08/18] install builddeps for tmt tests

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 plans/all.fmf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plans/all.fmf b/plans/all.fmf
index 6413ecf..5f468c5 100644
--- a/plans/all.fmf
+++ b/plans/all.fmf
@@ -15,6 +15,7 @@ execute:
     summary: Run tests on bodhi / errata and dist-git PRs
     discover+:
         filter: tag:downstream
+        dist-git-install-builddeps: true
         dist-git-source: true
         dist-git-remove-fmf-root: true
     adjust+:

From cece91cf4e4db14d6d8b32f96702d50973eef0e4 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Tue, 29 Oct 2024 18:27:42 +0000
Subject: [PATCH 09/18] Update to 1.13.0 upstream release

Upstream tag: v1.13.0
Upstream commit: 8bb48068

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore        |  2 ++
 .packit.yaml      | 48 ++++++++++++++++++++++++++---------------------
 README.packit     |  2 +-
 aardvark-dns.spec |  2 +-
 plans/all.fmf     |  1 -
 sources           |  4 ++--
 6 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 15bdafa..c822e4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,5 @@
 /v1.12.1.tar.gz
 /v1.12.2.tar.gz
 /aardvark-dns-v1.12.2-vendor.tar.gz
+/v1.13.0.tar.gz
+/aardvark-dns-v1.13.0-vendor.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
index d3ca1ec..f695011 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -30,6 +30,8 @@ packages:
     specfile_path: rpm/aardvark-dns.spec
   aardvark-dns-rhel:
     specfile_path: rpm/aardvark-dns.spec
+  aardvark-dns-eln:
+    specfile_path: rpm/aardvark-dns.spec
 
 srpm_build_deps:
   - cargo
@@ -44,8 +46,15 @@ jobs:
       failure_comment:
         message: "Ephemeral COPR build failed. @containers/packit-build please check."
     targets:
-      fedora-all-x86_64: {}
-      fedora-all-aarch64: {}
+      - fedora-all-x86_64
+      - fedora-all-aarch64
+    enable_net: true
+
+  - job: copr_build
+    trigger: pull_request
+    packages: [aardvark-dns-eln]
+    notifications: *copr_build_failure_notification
+    targets:
       fedora-eln-x86_64:
         additional_repos:
           - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/"
@@ -58,7 +67,7 @@ jobs:
     trigger: pull_request
     packages: [aardvark-dns-centos]
     notifications: *copr_build_failure_notification
-    targets:
+    targets: &centos_copr_targets
       - centos-stream-9-x86_64
       - centos-stream-9-aarch64
       - centos-stream-10-x86_64
@@ -94,19 +103,21 @@ jobs:
       failure_comment:
         message: "Tests failed. @containers/packit-build please check."
     targets:
-      - fedora-all-x86_64
-      - fedora-all-aarch64
+      - 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
 
   # Unit tests on CentOS Stream
   - job: tests
     trigger: pull_request
     packages: [aardvark-dns-centos]
     notifications: *test_failure_notification
-    targets:
-      - centos-stream-9-x86_64
-      - centos-stream-9-aarch64
-      - centos-stream-10-x86_64
-      - centos-stream-10-aarch64
+    targets: *centos_copr_targets
 
   # Unit tests on RHEL
   - job: tests
@@ -133,7 +144,7 @@ jobs:
     trigger: release
     packages: [aardvark-dns-fedora]
     update_release: false
-    dist_git_branches:
+    dist_git_branches: &fedora_targets
       - fedora-all
 
   # Sync to CentOS Stream
@@ -146,13 +157,8 @@ jobs:
 
   - job: koji_build
     trigger: commit
-    dist_git_branches:
-      - fedora-all
-
-        # NOTE: Bodhi update tasks are disabled to allow netavark and aardvark-dns X.Y
-        # builds in a single manual bodhi update. Leaving this commented out
-        # but not deleted so it's not forgotten.
-        #- job: bodhi_update
-        #trigger: commit
-        #dist_git_branches:
-        #- fedora-branched # rawhide updates are created automatically
+    packages: [aardvark-dns-fedora]
+    sidetag_group: netavark-releases
+    dependents:
+      - netavark
+    dist_git_branches: *fedora_targets
diff --git a/README.packit b/README.packit
index 00daafb..3d207b6 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.100.3.post1.dev13+g92513a8e.
+The file was generated using packit 0.102.2.post1.dev2+gbdca14cb.
diff --git a/aardvark-dns.spec b/aardvark-dns.spec
index cb3efc6..c39435f 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.12.2
+Version: 1.13.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/plans/all.fmf b/plans/all.fmf
index 5f468c5..6413ecf 100644
--- a/plans/all.fmf
+++ b/plans/all.fmf
@@ -15,7 +15,6 @@ execute:
     summary: Run tests on bodhi / errata and dist-git PRs
     discover+:
         filter: tag:downstream
-        dist-git-install-builddeps: true
         dist-git-source: true
         dist-git-remove-fmf-root: true
     adjust+:
diff --git a/sources b/sources
index 5be99cc..a326fe6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (v1.12.2.tar.gz) = 851683cd5ac569358c0f89895879c19ac607653f2f4578030a99911a4723dab025ca6d26615da6037baf95514e9bb7d3a2c86c618d57c67cee2b28fd3a73c072
-SHA512 (aardvark-dns-v1.12.2-vendor.tar.gz) = 1dfacc29962acca5c7baa11fbe4d1c93276b91cb5e1db6033d8e23e963ca4c4098bdbf4bdf89730fdea4d5a45b3a2c00ee65888d502e8009d2adaaa6f8374dba
+SHA512 (v1.13.0.tar.gz) = 012734539ff13a78b03a61a865aa4e3679a5f153aee75fe132f2727260832b617fd658925f6926e6b978ddaa591fa7da963cbcfa793c86518adec574a46c56da
+SHA512 (aardvark-dns-v1.13.0-vendor.tar.gz) = 056172a6ccb8a2e345c323bc40812fe9ea14f88ef3860a49e80c1cdf1b289b2797c6f7e0c8c74ab0bb1cde9d0c8dbfb501d1e452b36a4d09b0064b052927e94b

From 5f1f1ea08d665ca192388117fd5e3d8bebc95cd9 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Mon, 4 Nov 2024 17:19:44 +0530
Subject: [PATCH 10/18] fix tmt tests downstream

Fixed upstream at: https://github.com/containers/aardvark-dns/pull/536
---
 plans/all.fmf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plans/all.fmf b/plans/all.fmf
index 6413ecf..5f468c5 100644
--- a/plans/all.fmf
+++ b/plans/all.fmf
@@ -15,6 +15,7 @@ execute:
     summary: Run tests on bodhi / errata and dist-git PRs
     discover+:
         filter: tag:downstream
+        dist-git-install-builddeps: true
         dist-git-source: true
         dist-git-remove-fmf-root: true
     adjust+:

From ae197181c5b8b5dbf754d3ee51dd5f5da5b76564 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Wed, 6 Nov 2024 17:19:21 +0000
Subject: [PATCH 11/18] Update to 1.13.1 upstream release

Upstream tag: v1.13.1
Upstream commit: 966017cf

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore                  |  2 ++
 .packit.yaml                | 45 ++++++++++++-------------------------
 README.packit               |  2 +-
 aardvark-dns.spec           |  2 +-
 plans/{all.fmf => main.fmf} |  0
 sources                     |  4 ++--
 6 files changed, 20 insertions(+), 35 deletions(-)
 rename plans/{all.fmf => main.fmf} (100%)

diff --git a/.gitignore b/.gitignore
index c822e4a..43728e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,5 @@
 /aardvark-dns-v1.12.2-vendor.tar.gz
 /v1.13.0.tar.gz
 /aardvark-dns-v1.13.0-vendor.tar.gz
+/v1.13.1.tar.gz
+/aardvark-dns-v1.13.1-vendor.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
index f695011..e3e0afc 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -28,8 +28,6 @@ packages:
   aardvark-dns-centos:
     pkg_tool: centpkg
     specfile_path: rpm/aardvark-dns.spec
-  aardvark-dns-rhel:
-    specfile_path: rpm/aardvark-dns.spec
   aardvark-dns-eln:
     specfile_path: rpm/aardvark-dns.spec
 
@@ -49,6 +47,7 @@ jobs:
       - fedora-all-x86_64
       - fedora-all-aarch64
     enable_net: true
+    osh_diff_scan_after_copr_build: false
 
   - job: copr_build
     trigger: pull_request
@@ -74,15 +73,6 @@ jobs:
       - centos-stream-10-aarch64
     enable_net: true
 
-  - job: copr_build
-    trigger: pull_request
-    packages: [aardvark-dns-rhel]
-    notifications: *copr_build_failure_notification
-    targets:
-      - epel-9-x86_64
-      - epel-9-aarch64
-    enable_net: true
-
   # Run on commit to main branch
   - job: copr_build
     trigger: commit
@@ -111,6 +101,11 @@ jobs:
       - fedora-latest-stable-aarch64
       - fedora-40-x86_64
       - fedora-40-aarch64
+    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
   - job: tests
@@ -118,26 +113,13 @@ jobs:
     packages: [aardvark-dns-centos]
     notifications: *test_failure_notification
     targets: *centos_copr_targets
-
-  # Unit tests on RHEL
-  - job: tests
-    trigger: pull_request
-    packages: [aardvark-dns-rhel]
-    notifications: *test_failure_notification
-    use_internal_tf: true
-    targets:
-      epel-9-aarch64:
-        distros: [RHEL-9-Nightly,RHEL-9.4.0-Nightly]
-      epel-9-x86_64:
-        distros: [RHEL-9-Nightly,RHEL-9.4.0-Nightly]
-      # NOTE: Need to use centos-stream-10 until RHEL-10/EPEL-10 copr targets
-      # are available
-      # TODO: iptables kernel module is not available on rhel10.
-      # Enable these after netavark default is switched to nftables.
-      #centos-stream-10-aarch64:
-      #  distros: [RHEL-10-Beta-Nightly]
-      #centos-stream-10-x86_64:
-      #  distros: [RHEL-10-Beta-Nightly]
+    tf_extra_params:
+      environments:
+        - 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
@@ -154,6 +136,7 @@ jobs:
     update_release: false
     dist_git_branches:
       - c10s
+      - c9s
 
   - job: koji_build
     trigger: commit
diff --git a/README.packit b/README.packit
index 3d207b6..1b4760d 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.dev2+gbdca14cb.
+The file was generated using packit 0.102.2.post1.dev4+g3142fcf8.
diff --git a/aardvark-dns.spec b/aardvark-dns.spec
index c39435f..85b901a 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.0
+Version: 1.13.1
 # 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/plans/all.fmf b/plans/main.fmf
similarity index 100%
rename from plans/all.fmf
rename to plans/main.fmf
diff --git a/sources b/sources
index a326fe6..f63296e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (v1.13.0.tar.gz) = 012734539ff13a78b03a61a865aa4e3679a5f153aee75fe132f2727260832b617fd658925f6926e6b978ddaa591fa7da963cbcfa793c86518adec574a46c56da
-SHA512 (aardvark-dns-v1.13.0-vendor.tar.gz) = 056172a6ccb8a2e345c323bc40812fe9ea14f88ef3860a49e80c1cdf1b289b2797c6f7e0c8c74ab0bb1cde9d0c8dbfb501d1e452b36a4d09b0064b052927e94b
+SHA512 (v1.13.1.tar.gz) = 30265a8d134f600e52c4a412a5fa9b00313cef26ad019adf5233ed0a63cd108b5636e15322569b1bd609d6eb741ceca94f3a076b391aef7ef0d47e3ae7e7c9ad
+SHA512 (aardvark-dns-v1.13.1-vendor.tar.gz) = b5d5850409b54e74627b143669313dce35c94ea34533c6a89ea2d16e3155fe8030d406674fed8adbe9be9da6a71c5773d63382bde4364981adcfdbc036f515ac

From 71e88aab3c8fdef805394a3b764468bd5ebe62f5 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jan 2025 10:26:31 +0000
Subject: [PATCH 12/18] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild


From 47a0e242764c15f7ba1833ef9e1e4b8fcf660715 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Mon, 10 Feb 2025 14:29:37 +0000
Subject: [PATCH 13/18] 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 <hello@packit.dev>
Date: Tue, 13 May 2025 15:33:04 +0000
Subject: [PATCH 14/18] 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 <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 16:41:16 +0000
Subject: [PATCH 15/18] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From 1702e377199c9923bce5935c45648eaaabe7cfa7 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Thu, 14 Aug 2025 18:16:39 +0000
Subject: [PATCH 16/18] 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 <hello@packit.dev>
Date: Wed, 12 Nov 2025 15:19:24 +0000
Subject: [PATCH 17/18] 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 <releng@fedoraproject.org>
Date: Fri, 16 Jan 2026 03:22:36 +0000
Subject: [PATCH 18/18] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild