Update to 1.14.0 upstream release

Upstream tag: v1.14.0
Upstream commit: 423ee203

Commit authored by Packit automation (https://packit.dev/)

.gitignore

@@ -40,9 +40,3 @@
 /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
-/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

.packit.yaml

@@ -16,11 +16,6 @@ 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
@@ -38,15 +33,9 @@ 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
@@ -54,7 +43,7 @@ jobs:
     notifications: &copr_build_failure_notification
       failure_comment:
         message: "Ephemeral COPR build failed. @containers/packit-build please check."
-    targets: &fedora_copr_targets
+    targets:
       - fedora-all-x86_64
       - fedora-all-aarch64
     enable_net: true
@@ -96,21 +85,29 @@ jobs:
     project: podman-next
     enable_net: true
 
-  # Tests on Fedora
+  # Unit 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_copr_targets
+    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
     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
 
-  # Tests on CentOS Stream
+  # Unit tests on CentOS Stream
   - job: tests
     trigger: pull_request
     packages: [aardvark-dns-centos]
@@ -121,6 +118,8 @@ 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

README.packit

@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 1.12.0.post1.dev13+gd51655c23.
+The file was generated using packit 1.1.0.post1.dev2+gf7b527d0.

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.17.0
+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
@@ -53,23 +53,6 @@ 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: socat
-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
@@ -95,14 +78,6 @@ 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}
@@ -112,8 +87,5 @@ tar fx %{SOURCE1}
 %dir %{_libexecdir}/podman
 %{_libexecdir}/podman/%{name}
 
-%files tests
-%{_datadir}/%{name}/test
-
 %changelog
 %autochangelog

gating.yaml

@@ -1,10 +1,7 @@
 --- !Policy
 product_versions:
   - fedora-*
-decision_contexts:
-  - bodhi_update_push_stable
-  - bodhi_update_push_testing
-subject_type: koji_build
+decision_context: bodhi_update_push_stable
 rules:
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
 
@@ -12,5 +9,4 @@ rules:
 product_versions:
   - rhel-*
 decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
+rules: []

plans/main.fmf

@@ -2,32 +2,22 @@ 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
 
-/no-rpm:
-    summary: Run tests independent of rpm
+/upstream:
+    summary: Run tests on upstream PRs
     discover+:
-        filter: tag:no-rpm
+        filter: tag:upstream
     adjust+:
-        - enabled: false
-          when: initiator is not defined or initiator != packit
+        enabled: false
+        when: initiator is not defined or initiator != packit
 
-/rpm:
-    summary: Run tests on the rpm
+/downstream:
+    summary: Run tests on bodhi / errata and dist-git PRs
     discover+:
-        filter: tag:rpm
+        filter: tag:downstream
+        dist-git-install-builddeps: true
+        dist-git-source: true
+        dist-git-remove-fmf-root: true
+    adjust+:
+        enabled: false
+        when: initiator == packit

sources

@@ -1,2 +1,2 @@
-SHA512 (v1.17.0.tar.gz) = 42e3a261bb5b9df83b8bb853ed50dd7dfda643895262aedf5ccdc865c598e913996a244d234ac309a18ee1a884b7ba847679dfe5d8b6521e674114c8aba552da
-SHA512 (aardvark-dns-v1.17.0-vendor.tar.gz) = b7ec2a2a34d5bb36dbcc55611dc9ec0ff2c1bed4469cc4b12d4eb0bd78bb7d6cae6f80a02ac32ade5c435fdd11e22ddd99646aa4de504c8369ee56cfa470e6a5
+SHA512 (v1.14.0.tar.gz) = 0300c474bb748063bf96488c06920df15ade525a8ee288446d3f30c3cffdccd687744efbb76e54a6b2213c38c02b00400ad79459bd78e8721556ff8dcdc1df8e
+SHA512 (aardvark-dns-v1.14.0-vendor.tar.gz) = 0d738d0a737bfc9b6b2fe728de343a6a91c6e197d888fd37c0859b831b05f8c92efce13c268fc8f31a09bb78d43f4330230a0454744523df5a4fa96498ca3dac

test/tmt/tmt/main.fmf

@@ -1,26 +0,0 @@
-/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

test/tmt/tmt/test_integration.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-set -exo pipefail
-
-rpm -q aardvark-dns aardvark-dns-tests netavark
-
-cd /usr/share/aardvark-dns/
-bats test/