diff --git a/.gitignore b/.gitignore index edf038e..0eb4a68 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,9 @@ /aardvark-dns-v1.16.0-vendor.tar.gz /v1.17.0.tar.gz /aardvark-dns-v1.17.0-vendor.tar.gz +/v1.17.1.tar.gz +/aardvark-dns-v1.17.1-vendor.tar.gz +/v2.0.0.tar.gz +/aardvark-dns-v2.0.0-vendor.tar.gz +/v2.1.0.tar.gz +/aardvark-dns-v2.1.0-vendor.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 89d1cee..aee51bb 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -51,9 +51,6 @@ jobs: - job: copr_build trigger: pull_request packages: [aardvark-dns-fedora] - notifications: &copr_build_failure_notification - failure_comment: - message: "Ephemeral COPR build failed. @containers/packit-build please check." targets: &fedora_copr_targets - fedora-all-x86_64 - fedora-all-aarch64 @@ -63,7 +60,6 @@ jobs: - job: copr_build trigger: pull_request packages: [aardvark-dns-eln] - notifications: *copr_build_failure_notification targets: fedora-eln-x86_64: additional_repos: @@ -76,7 +72,6 @@ jobs: - job: copr_build trigger: pull_request packages: [aardvark-dns-centos] - notifications: *copr_build_failure_notification targets: ¢os_copr_targets - centos-stream-9-x86_64 - centos-stream-9-aarch64 @@ -88,9 +83,6 @@ jobs: - job: copr_build trigger: commit packages: [aardvark-dns-fedora] - notifications: - failure_comment: - message: "podman-next COPR build failed. @containers/packit-build please check." branch: main owner: rhcontainerbot project: podman-next @@ -99,11 +91,10 @@ jobs: # Tests on Fedora - job: tests trigger: pull_request + identifier: integration-fedora packages: [aardvark-dns-fedora] - notifications: &test_failure_notification - failure_comment: - message: "Tests failed. @containers/packit-build please check." targets: *fedora_copr_targets + tmt_plan: "/plans/integration" tf_extra_params: environments: - artifacts: @@ -113,22 +104,54 @@ jobs: # Tests on CentOS Stream - job: tests trigger: pull_request + identifier: integration-centos packages: [aardvark-dns-centos] - notifications: *test_failure_notification targets: *centos_copr_targets + tmt_plan: "/plans/integration" tf_extra_params: environments: - artifacts: - type: repository-file id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/centos-stream-$releasever/rhcontainerbot-podman-next-centos-stream-$releasever.repo + # Validate test (no RPM build needed) + - job: tests + trigger: pull_request + identifier: validate + skip_build: true + targets: + - fedora-latest-x86_64 + tmt_plan: "/plans/validate" + + # Unit tests (no RPM build needed) + - job: tests + trigger: pull_request + identifier: unit + skip_build: true + targets: + - fedora-latest-x86_64 + tmt_plan: "/plans/unit" + + # MSRV test (no RPM build needed) + - job: tests + trigger: pull_request + identifier: msrv + skip_build: true + targets: + - fedora-latest-x86_64 + tmt_plan: "/plans/msrv" + # Sync to Fedora + # NOTE: Breaking changes related to Podman6 will only be shipped to Fedora + # Rawhide (to be Fedora 45) and newer. + # TODO: Update dist_git_branches as and when new Fedora releases are + # available. - job: propose_downstream trigger: release packages: [aardvark-dns-fedora] update_release: false dist_git_branches: &fedora_targets - - fedora-all + - fedora-rawhide # Sync to CentOS Stream - job: propose_downstream diff --git a/README.packit b/README.packit index e03362b..ef5aa9d 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 1.12.0.post1.dev13+gd51655c23. +The file was generated using packit 1.16.2.post1.dev6+g30936cda7. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index 08b71ac..b26ebbb 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.17.0 +Version: 2.1.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/plans/main.fmf b/plans/main.fmf index 2b884e7..b21b11d 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -4,30 +4,30 @@ 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 + how: feature + epel: enabled 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 + script: bash contrib/tmt/update-deps.sh order: 20 -/no-rpm: - summary: Run tests independent of rpm +/validate: + summary: Validate test discover+: - filter: tag:no-rpm - adjust+: - - enabled: false - when: initiator is not defined or initiator != packit + test: /validate -/rpm: - summary: Run tests on the rpm +/unit: + summary: Unit tests discover+: - filter: tag:rpm + test: /unit + +/integration: + summary: Integration tests + discover+: + test: /integration + +/msrv: + summary: MSRV test + discover+: + test: /msrv diff --git a/sources b/sources index 413dc03..554ad85 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.17.0.tar.gz) = 42e3a261bb5b9df83b8bb853ed50dd7dfda643895262aedf5ccdc865c598e913996a244d234ac309a18ee1a884b7ba847679dfe5d8b6521e674114c8aba552da -SHA512 (aardvark-dns-v1.17.0-vendor.tar.gz) = b7ec2a2a34d5bb36dbcc55611dc9ec0ff2c1bed4469cc4b12d4eb0bd78bb7d6cae6f80a02ac32ade5c435fdd11e22ddd99646aa4de504c8369ee56cfa470e6a5 +SHA512 (v2.1.0.tar.gz) = 7f5b7d1823e607b19cedfe8a4f0c42616603f491c311674a998cd10df2da9d9c087d02d3ca045eb842c9bdcaeb0aaca022985a2aae9513927774ea741ca854aa +SHA512 (aardvark-dns-v2.1.0-vendor.tar.gz) = ce37fa79aabfc1d1bc1cc8db9c904930010d16eea082b9f525252294b5c318a717468729e3569cddd7c03d39f76b4627c0e09b8ea4df42bb11da588c871dd041 diff --git a/test/tmt/tmt/main.fmf b/test/tmt/tmt/main.fmf index 9210cc8..846b340 100644 --- a/test/tmt/tmt/main.fmf +++ b/test/tmt/tmt/main.fmf @@ -1,20 +1,23 @@ /validate: - tag: [ no-rpm, validate ] summary: Validate test test: make -C ../.. validate require: - clippy - rustfmt + adjust: + enabled: false + when: initiator is not defined or initiator != packit /unit: - tag: [ no-rpm, unit ] summary: Unit tests test: make -C ../.. unit require: - cargo + adjust: + enabled: false + when: initiator is not defined or initiator != packit /integration: - tag: [ rpm, integration ] summary: Integration tests test: bash test_integration.sh environment: @@ -24,3 +27,18 @@ adjust: duration: 10m when: arch == aarch64 + +/msrv: + summary: Minimum Supported Rust Version (MSRV) check + test: | + MSRV=$(grep '^rust-version' ../../Cargo.toml | cut -d'"' -f2) + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain "$MSRV" + source $HOME/.cargo/env + make -C ../.. build + require: + - curl + - gcc + - openssl-devel + adjust: + enabled: false + when: initiator is not defined or initiator != packit