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..3976d54 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. 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