From 504967952ca474261a83b9e3c32d0ee2aac9fec1 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 5 Aug 2024 07:58:41 +0200 Subject: [PATCH] Update to 1.12.1 upstream release Upstream tag: v1.12.1 Upstream commit: 95aeb560 Commit authored by Packit automation (https://packit.dev/) --- .fmf/version | 1 + .gitignore | 2 ++ .packit.yaml | 89 +++++++++++++++-------------------------------- README.packit | 2 +- aardvark-dns.spec | 27 ++++++++------ gating.yaml | 10 ++++-- plans/all.fmf | 22 ++++++++++++ sources | 4 +-- 8 files changed, 81 insertions(+), 76 deletions(-) create mode 100644 .fmf/version 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 776472d..38f216f 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 +/v1.12.1.tar.gz +/aardvark-dns-v1.12.1-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 3976d54..bd4a9c5 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. +The file was generated using packit 0.99.0. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index edb5d0f..4cfe6da 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -22,10 +22,10 @@ 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: 4%{?dist} +Release: 1%{?dist} %if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} %else @@ -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 index d75f6c7..dbb1d91 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,6 +1,12 @@ -# recipients: jnovy, lsm5, santiago --- !Policy product_versions: - - rhel-10 + - 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 95b5cfe..794dcee 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 (v1.12.1.tar.gz) = 63e10296b97791d23ae8714af99bc533bf01c4a584bc8bd9e2b935785a61eed58f96bb1e369fb46ed45dcc5ca0740fc3264315ad584a32212b49f5ee8e524881 +SHA512 (aardvark-dns-v1.12.1-vendor.tar.gz) = f4b7cfeface7c725201499f3a182ab1d3ad0aba9ad1fcfd364a8dc0684b31c42800c671e856f93634e71f1fb334121cf8dfc809f0e4a9bb14fe0cc493715dc43