diff --git a/gating.yml b/gating.yml deleted file mode 100644 index f075ad7..0000000 --- a/gating.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_testing -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} - ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_stable -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/knot-resolver.spec b/knot-resolver.spec index 6dcd618..eccfcce 100644 --- a/knot-resolver.spec +++ b/knot-resolver.spec @@ -7,7 +7,7 @@ Name: knot-resolver Version: 5.7.6 -Release: 3%{?dist} +Release: 1%{?dist} Summary: Caching full DNS Resolver License: GPL-3.0-or-later @@ -47,7 +47,6 @@ BuildRequires: pkgconfig(libcap-ng) BuildRequires: pkgconfig(libuv) BuildRequires: pkgconfig(luajit) >= 2.0 BuildRequires: pkgconfig(jemalloc) -BuildRequires: systemd-rpm-macros Requires: systemd Requires(post): systemd @@ -380,12 +379,6 @@ fi %endif %changelog -* Mon Oct 20 2025 Jakub Ružička - 5.7.6-3 -- Rebuilt for Knot DNS 3.5 - -* Thu Jul 24 2025 Fedora Release Engineering - 5.7.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - * Fri Jul 18 2025 Jakub Ružička - 5.7.6-1 - New upstream version 5.7.6 @@ -396,18 +389,9 @@ fi * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 5.7.4-4 - Add sysusers.d config file to allow rpm to create users/groups automatically -* Fri Jan 17 2025 Fedora Release Engineering - 5.7.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Nov 26 2024 Jakub Ružička - 5.7.4-2 -- Rebuilt for Knot DNS 3.4 - * Wed Jul 24 2024 Jakub Ružička - 5.7.4-1 - New upstream version 5.7.4 -* Thu Jul 18 2024 Fedora Release Engineering - 5.7.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - * Tue Jun 04 2024 Jakub Ružička - 5.7.3-1 - New upstream version 5.7.3 @@ -417,39 +401,20 @@ fi * Wed Feb 14 2024 Jakub Ružička - 5.7.1-1 - New upstream version 5.7.1 -* Thu Jan 25 2024 Fedora Release Engineering - 5.7.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 5.7.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Nov 09 2023 Jakub Ružička - 5.7.0-3 -- Rebuild for Fedora 40, Knot DNS 3.3.2 - * Tue Aug 29 2023 Jakub Ružička - 5.7.0-2 - Rebuilt for Knot DNS 3.3 * Tue Aug 22 2023 Jakub Ružička - 5.7.0-1 - New upstream version 5.7.0 -* Thu Jul 20 2023 Fedora Release Engineering - 5.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - * Thu Jan 26 2023 Jakub Ružička - 5.6.0-1 - update to upstream version 5.6.0 -* Thu Jan 19 2023 Fedora Release Engineering - 5.5.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - * Thu Sep 22 2022 Jakub Ružička - 5.5.3-1 - update to upstream version 5.5.3 * Wed Aug 24 2022 Jakub Ružička - 5.5.2-1 - update to upstream version 5.5.2 -- add BuildRequires: systemd-rpm-macros - -* Thu Jul 21 2022 Fedora Release Engineering - 5.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild * Tue Jun 14 2022 Jakub Ružička - 5.5.1-1 - update to upstream version 5.5.1 @@ -458,54 +423,35 @@ fi - update to upstream version 5.5.0 - update upstream signing keys -* Thu Jan 20 2022 Fedora Release Engineering - 5.4.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - * Wed Jan 05 2022 Jakub Ružička - 5.4.4-1 - update to upstream version 5.4.4 * Wed Dec 01 2021 Jakub Ružička - 5.4.3-1 - update to upstream version 5.4.3 -* Sat Nov 06 2021 Adrian Reber - 5.4.2-3 -- Rebuilt for protobuf 3.19.0 - -* Tue Oct 26 2021 Adrian Reber - 5.4.2-2 -- Rebuilt for protobuf 3.18.1 - * Mon Oct 18 2021 Jakub Ružička - 5.4.2-1 - update to upstream version 5.4.2 +* Mon Sep 06 2021 Jakub Ružička - 5.4.1-2 +- rebuild for Knot DNS 3.1 + * Thu Aug 19 2021 Jakub Ružička - 5.4.1-1 - update to upstream version 5.4.1 -* Mon Aug 09 2021 Jakub Ružička - 5.4.0-2 -- rebuild for Knot DNS 3.1 (#1990583) - * Thu Jul 29 2021 Jakub Ružička - 5.4.0-1 - update to upstream version 5.4.0 -* Thu Jul 22 2021 Fedora Release Engineering - 5.3.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - * Fri May 07 2021 Jakub Ružička - 5.3.2-1 - update to upstream version 5.3.2 * Thu Apr 01 2021 Jakub Ružička - 5.3.1-1 - update to upstream version 5.3.1 -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 5.3.0-2 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - * Mon Mar 01 2021 Jakub Ružička - 5.3.0-1 - update to upstream version 5.3.0 - add dnstap module subpackage - required Knot DNS >= 2.9 -* Tue Jan 26 2021 Fedora Release Engineering - 5.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - * Fri Dec 18 2020 Jakub Ružička - 5.2.1-1 - update to upstream version 5.2.1 @@ -513,6 +459,12 @@ fi - update to upstream version 5.2.0 - sync packaging from upstream +* Fri Sep 25 2020 Jakub Ružička 5.1.3-4 +- rebuild for new bodhi update + +* Thu Sep 24 2020 Jakub Ružička 5.1.3-3 +- rebuild for Knot DNS 3.0.0 + * Wed Sep 23 2020 Jakub Ružička 5.1.3-2 - rebuild for Knot DNS 3.0.0 diff --git a/tests/README.md b/tests/README.md index 8f69da4..295aeb7 100644 --- a/tests/README.md +++ b/tests/README.md @@ -2,7 +2,7 @@ Package tests ============= These tests implement the standard test interface in Fedora CI. -See https://docs.fedoraproject.org/en-US/ci/tests/ for details. +See https://fedoraproject.org/wiki/CI/Tests for details. Manual execution ---------------- @@ -12,3 +12,11 @@ modifications to your system. It's best to run these on a clean, throw-away testing system or a VM. ansible-playbook tests/tests.yml -e subjects=/path/to/knot-resolver.rpm -e artifacts=/path/to/artifacts + +Automatic execution +------------------- + +These tests should eventually be automatically executed by the Fedora CI +pipeline. As of 2018-01-10, it is not supported for packages that aren't part +of Fedora Atomic. Once it is implemented, the results of these tests should be +visible in dist-git commits on src.fedoraproject.org diff --git a/tests/scripts/test_manual_activation.sh b/tests/scripts/test_manual_activation.sh deleted file mode 100755 index c595e05..0000000 --- a/tests/scripts/test_manual_activation.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -ex - -systemctl stop kresd@1.service -systemctl start kresd@1.service - -dig @127.0.0.1 . diff --git a/tests/test_manual_activation.yml b/tests/test_manual_activation.yml new file mode 100644 index 0000000..cb61748 --- /dev/null +++ b/tests/test_manual_activation.yml @@ -0,0 +1,24 @@ +--- +- block: + - name: make sure kresd@1 socket and service is off + service: + name: "{{ item }}" + state: stopped + with_items: + - kresd@1.service + - kresd@1.socket + failed_when: false + + - name: start kresd@1.service + service: + name: kresd@1.service + state: started + + - name: check if query is answered + shell: dig @127.0.0.1 . + rescue: + - set_fact: + manual_activation_failed: true + always: + - name: collect journal + shell: journalctl --since -10m > {{ artifacts }}/test_manual_activation_journal.log diff --git a/tests/test_socket_activation.yml b/tests/test_socket_activation.yml new file mode 100644 index 0000000..43c4c5e --- /dev/null +++ b/tests/test_socket_activation.yml @@ -0,0 +1,23 @@ +--- +- block: + - name: make sure kresd socket and service is off + service: + name: "{{ item }}" + state: stopped + with_items: + - kresd@1.service + - kresd.socket + + - name: start kresd.socket + service: + name: kresd.socket + state: started + + - name: check if query is answered + shell: dig @127.0.0.1 . + rescue: + - set_fact: + socket_activation_failed: true + always: + - name: collect journal + shell: journalctl --since -10m > {{ artifacts }}/test_socket_activation_journal.log diff --git a/tests/tests.yml b/tests/tests.yml index 1f4dc95..e42b12e 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -1,15 +1,28 @@ --- - hosts: localhost remote_user: root + pre_tasks: + - package: # Install additional dependecies + name: bind-utils + state: latest roles: - - role: standard-test-basic + - role: standard-test-rpm tags: - classic - required_packages: - - bind-utils - tests: - - kresd-show-version: - run: kresd --version - - manual-activation: - dir: scripts - run: ./test_manual_activation.sh + tasks: + - include_tasks: test_socket_activation.yml + when: ansible_distribution == 'Fedora' + - include_tasks: test_manual_activation.yml + + - set_fact: + tests_passed: '{{ socket_activation_failed is undefined and manual_activation_failed is undefined }}' + - name: report results + debug: + msg: | + test_socket_activation: {{ 'FAILED' if socket_activation_failed is defined else 'OK'}} + test_manual_activation: {{ 'FAILED' if manual_activation_failed is defined else 'OK'}} + + - name: fail playbook if tests failed + debug: + msg: --- {{ 'PASSED' if tests_passed else 'FAILED' }} --- + failed_when: not tests_passed