From fa6fdd024f8780873e73b363e89bc865da549e42 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 27 Sep 2023 18:34:33 +0000 Subject: [PATCH 01/10] [packit] 1.8.0 upstream release Upstream tag: v1.8.0 Upstream commit: 1ed94020 --- .gitignore | 2 ++ .packit.yaml | 49 +++++++++++++++++++++++++++-------------------- README.packit | 2 +- aardvark-dns.spec | 36 +++++++--------------------------- sources | 4 ++-- 5 files changed, 40 insertions(+), 53 deletions(-) diff --git a/.gitignore b/.gitignore index f6598e3..bc73427 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ /v1.6.0.tar.gz /v1.7.0.tar.gz /aardvark-dns-v1.7.0-vendor.tar.gz +/v1.8.0.tar.gz +/aardvark-dns-v1.8.0-vendor.tar.gz diff --git a/.packit.yaml b/.packit.yaml index a4ed4b1..51b7886 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -2,40 +2,47 @@ # See the documentation for more information: # https://packit.dev/docs/configuration/ -# COPR build targets can be found at: -# https://copr.fedorainfracloud.org/coprs/rhcontainerbot/packit-builds/ -# and -# https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/ - specfile_path: rpm/aardvark-dns.spec upstream_tag_template: v{version} -jobs: - - &copr - job: copr_build - trigger: pull_request - owner: rhcontainerbot - project: packit-builds - enable_net: true - srpm_build_deps: - - cargo - - make - - openssl-devel +srpm_build_deps: + - cargo + - make + - openssl-devel - - <<: *copr - # Run on commit to main branch +jobs: + - job: copr_build + trigger: pull_request + notifications: + failure_comment: + message: "Ephemeral COPR build failed. @containers/packit-build please check." + enable_net: true + targets: + - fedora-all-x86_64 + - fedora-all-aarch64 + - centos-stream+epel-next-8-x86_64 + - centos-stream+epel-next-8-aarch64 + - centos-stream+epel-next-9-x86_64 + - centos-stream+epel-next-9-aarch64 + additional_repos: + - "copr://rhcontainerbot/podman-next" + + # Run on commit to main branch + - job: copr_build trigger: commit + notifications: + failure_comment: + message: "podman-next COPR build failed. @containers/packit-build please check." branch: main + owner: rhcontainerbot project: podman-next + enable_net: true - job: propose_downstream trigger: release update_release: false dist_git_branches: - fedora-all - actions: - pre-sync: - - "bash rpm/update-spec-provides.sh" - job: koji_build trigger: commit diff --git a/README.packit b/README.packit index 101115f..8b12de4 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.77.0.post2+g06f877b. +The file was generated using packit 0.81.0.post1.dev4+g3347ce2b. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index 98dce4c..cdbaaf1 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -18,30 +18,8 @@ %global debug_package %{nil} %endif -# copr_username is only set on copr environments owned by rhcontainerbot, -# not on other coprs or environments like koji. -%if %{defined copr_username} && "%{?copr_username}" == "rhcontainerbot" -%bcond_without copr -%else -%bcond_with copr -%endif - -# rhel 8 does not support %%autochangelog -%if %{defined rhel} && 0%{?rhel} <= 8 -%bcond_without manual_changelog -%else -%bcond_with manual_changelog -%endif - -# rhel does not define %%{golang_arches_future} -%if %{defined fedora} -%bcond_without golang_arches_future -%else -%bcond_with golang_arches_future -%endif - Name: aardvark-dns -%if %{with copr} +%if %{defined copr_username} Epoch: 102 %endif # DO NOT TOUCH the Version string! @@ -50,10 +28,11 @@ 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.7.0 -License: Apache-2.0 and MIT and Zlib +Version: 1.8.0 +# The `AND` needs to be uppercase in the License for SPDX compatibility +License: Apache-2.0 AND MIT AND Zlib Release: %autorelease -%if %{with golang_arches_future} +%if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} %else ExclusiveArch: aarch64 ppc64le s390x x86_64 @@ -67,13 +46,12 @@ BuildRequires: cargo BuildRequires: git-core BuildRequires: make %if %{defined rhel} +# rust-toolset requires the `local` repo enabled on non-koji ELN build environments BuildRequires: rust-toolset %else BuildRequires: rust-packaging BuildRequires: rust-srpm-macros %endif -# DO NOT DELETE BELOW LINE - used for updating downstream imports -# vendored libraries %description %{summary} @@ -86,7 +64,7 @@ Read more about configuration in `src/backend/mod.rs`. # Following steps are only required on environments like koji which have no # network access and thus depend on the vendored tarball. Copr pulls # dependencies directly from the network. -%if %{without copr} +%if !%{defined copr_username} tar fx %{SOURCE1} mkdir -p .cargo diff --git a/sources b/sources index 3dd3bb8..8304be9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.7.0.tar.gz) = d829ac122f26f17ca44a41a48576ab8c4f9dd238bc52faee816833f63f9ff54e63f62610167e4619084263e61cdb1329c2e1d49f314c8b9e65e748df80fd5096 -SHA512 (aardvark-dns-v1.7.0-vendor.tar.gz) = 07d3ebc7504fc1e4c0fe9b5f3760bdbe9b4153678aae962c9e37a0097bee832b0e4e77fadfc475c82fa05ffaa1a04f53df8f92b63e23b09da05e5e2efaa07c94 +SHA512 (v1.8.0.tar.gz) = 271f11d6b8779938682da2affce80601bc642df768b7d868176d641e216c0acff2029a8ed39a20ca25d116ddd694603d67672d3ec6672be29ff6b43ad8bf90d1 +SHA512 (aardvark-dns-v1.8.0-vendor.tar.gz) = da300932f27f3fcde2f3bc2b67f0e5eb2184c428274844363fdaccc29c845e7f2efc238019f4bf3ff10bcd3e867a1d9dc603a0fac37686e579f47a3ac9cb2e55 From 31bc1ddb0172fc10ba31ef3beb111ebf85c940ef Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 27 Nov 2023 14:19:30 +0000 Subject: [PATCH 02/10] [packit] 1.9.0 upstream release Upstream tag: v1.9.0 Upstream commit: e4785bd5 --- .gitignore | 2 ++ .packit.yaml | 82 +++++++++++++++++++++++++++++++++++++++++++---- README.packit | 2 +- aardvark-dns.spec | 2 +- sources | 4 +-- 5 files changed, 81 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index bc73427..c4089ab 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,5 @@ /aardvark-dns-v1.7.0-vendor.tar.gz /v1.8.0.tar.gz /aardvark-dns-v1.8.0-vendor.tar.gz +/v1.9.0.tar.gz +/aardvark-dns-v1.9.0-vendor.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 51b7886..61e87f1 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -16,16 +16,22 @@ jobs: notifications: failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." - enable_net: true targets: - - fedora-all-x86_64 - - fedora-all-aarch64 - - centos-stream+epel-next-8-x86_64 - - centos-stream+epel-next-8-aarch64 - - centos-stream+epel-next-9-x86_64 - - centos-stream+epel-next-9-aarch64 + fedora-all-x86_64: {} + fedora-all-aarch64: {} + fedora-eln-x86_64: + additional_repos: + - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/" + 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 # Run on commit to main branch - job: copr_build @@ -38,6 +44,68 @@ 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 + - job: tests + trigger: pull_request + skip_build: true + targets: &pr_test_targets + - fedora-all-x86_64 + - fedora-all-aarch64 + - epel-8-x86_64 + - epel-8-aarch64 + - epel-9-x86_64 + - epel-9-aarch64 + identifier: unit_test + tmt_plan: "/plans/unit_test" + + # Integration tests + - job: tests + trigger: pull_request + targets: *pr_test_targets + identifier: integration_test + tmt_plan: "/plans/integration_test" + + # Unit tests on RHEL + - job: tests + trigger: pull_request + skip_build: true + 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] + epel-9-x86_64: + distros: [RHEL-9.3.0-Nightly,RHEL-9.4.0-Nightly] + identifier: unit_test_internal + tmt_plan: "/plans/unit_test" + + # Integration tests on RHEL + - job: tests + trigger: pull_request + 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 + tmt_plan: "/plans/integration_test" + - job: propose_downstream trigger: release update_release: false diff --git a/README.packit b/README.packit index 8b12de4..d778d97 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.81.0.post1.dev4+g3347ce2b. +The file was generated using packit 0.86.2.post1.dev2+g209847d1. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index cdbaaf1..e25087d 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -28,7 +28,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.8.0 +Version: 1.9.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 8304be9..026387b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.8.0.tar.gz) = 271f11d6b8779938682da2affce80601bc642df768b7d868176d641e216c0acff2029a8ed39a20ca25d116ddd694603d67672d3ec6672be29ff6b43ad8bf90d1 -SHA512 (aardvark-dns-v1.8.0-vendor.tar.gz) = da300932f27f3fcde2f3bc2b67f0e5eb2184c428274844363fdaccc29c845e7f2efc238019f4bf3ff10bcd3e867a1d9dc603a0fac37686e579f47a3ac9cb2e55 +SHA512 (v1.9.0.tar.gz) = aff59b43b2a03dccd5dc418c8ba64f1f90cd665f017dc11ff55e25af5146c76491bfb52e2cf06adaf62c08ba02309cd128d8cdd34343cf9ee5c57d0599fa5f8e +SHA512 (aardvark-dns-v1.9.0-vendor.tar.gz) = f7174f1c4275991a6a2655046697f32511586f53fb343efa25f995cc07663091a634e8a82395840b022b6b3c8363863cdf8c9b6d4e38984fb841978eef0b1f22 From 03beb7375fc8462e6eb5feac1fa3c3810feeb676 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 24 Jan 2024 20:58:51 +0000 Subject: [PATCH 03/10] [packit] 1.10.0 upstream release Upstream tag: v1.10.0 Upstream commit: 875c7173 --- .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 c4089ab..afa8b52 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ /aardvark-dns-v1.8.0-vendor.tar.gz /v1.9.0.tar.gz /aardvark-dns-v1.9.0-vendor.tar.gz +/v1.10.0.tar.gz +/aardvark-dns-v1.10.0-vendor.tar.gz diff --git a/README.packit b/README.packit index d778d97..bba9424 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.86.2.post1.dev2+g209847d1. +The file was generated using packit 0.89.0.post1.dev4+gabf90471. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index e25087d..ef26893 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -28,7 +28,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.9.0 +Version: 1.10.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 026387b..7e0d26c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.9.0.tar.gz) = aff59b43b2a03dccd5dc418c8ba64f1f90cd665f017dc11ff55e25af5146c76491bfb52e2cf06adaf62c08ba02309cd128d8cdd34343cf9ee5c57d0599fa5f8e -SHA512 (aardvark-dns-v1.9.0-vendor.tar.gz) = f7174f1c4275991a6a2655046697f32511586f53fb343efa25f995cc07663091a634e8a82395840b022b6b3c8363863cdf8c9b6d4e38984fb841978eef0b1f22 +SHA512 (v1.10.0.tar.gz) = 9ff315dc576f94bfc0affb6658bb47d9b7d448cf11294df607f7e8701662f148fb655f1eae6eb118f16b9e0779d27ab86d651883b1fd3bdc0e29c587bf47729b +SHA512 (aardvark-dns-v1.10.0-vendor.tar.gz) = 68d0106b71f42ba789810020d62911d880debf90a35a086aabfd614403985025dc0c5934087a98943b53f6dfd8ede4add99465cec1ae9a098ff1de1082e1ef9c From 9930d1f20c8b86c2aa8135e509b04d19b9acf357 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 30 May 2024 15:37:41 +0000 Subject: [PATCH 04/10] 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 ef7676829fca9b9836bffa2028b3c0af7a8f039f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 26 Jul 2024 10:00:30 -0400 Subject: [PATCH 05/10] epoch: 2 on non-copr (cherry picked from commit 14f5d331e710676f6dd9c7fc83d51ce499bc3d7b) --- 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 be501cbf59a55b99d376ae3dc8e9af3bcdf826c0 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 26 Jul 2024 10:39:44 -0400 Subject: [PATCH 06/10] rebuild (cherry picked from commit 2af607a4576c9bd3f12be619d38a25849ddbff56) From 743a98cb78c872d859bd880b1f5dc13271c23020 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 26 Jul 2024 10:39:46 -0400 Subject: [PATCH 07/10] rebuild (cherry picked from commit 5d3e595eb626f1b1cab16ab90124663d4deed28c) From cde445d61a7f463531ad3dc03bdb3beeb713caad Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 2 Aug 2024 13:32:40 -0400 Subject: [PATCH 08/10] bump to v1.12.1 (cherry picked from commit 43998e7c071c16517cc87d11ba752223b2e67611) --- .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 c69332a9addf5be86ced7200cc63b60b494c1bb1 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 4 Sep 2024 13:55:30 +0000 Subject: [PATCH 09/10] 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 81bf8725e0d45414f5435052b6a7d47574c93bc3 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 5 Sep 2024 17:10:13 +0530 Subject: [PATCH 10/10] install builddeps for tmt tests Signed-off-by: Lokesh Mandvekar (cherry picked from commit 5716cbb68b57f0b9cfa7af6f841922620b63af28) --- 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+: