diff --git a/.gitignore b/.gitignore index 0eb4a68..66eab0c 100644 --- a/.gitignore +++ b/.gitignore @@ -48,7 +48,3 @@ /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 aee51bb..89d1cee 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -51,6 +51,9 @@ 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 @@ -60,6 +63,7 @@ jobs: - job: copr_build trigger: pull_request packages: [aardvark-dns-eln] + notifications: *copr_build_failure_notification targets: fedora-eln-x86_64: additional_repos: @@ -72,6 +76,7 @@ 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 @@ -83,6 +88,9 @@ 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 @@ -91,10 +99,11 @@ 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: @@ -104,54 +113,22 @@ 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-rawhide + - fedora-all # Sync to CentOS Stream - job: propose_downstream diff --git a/README.packit b/README.packit index ef5aa9d..e229dc4 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.16.2.post1.dev6+g30936cda7. +The file was generated using packit 1.15.3. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index b26ebbb..7d6753c 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: 2.1.0 +Version: 1.17.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/plans/main.fmf b/plans/main.fmf index b21b11d..2b884e7 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: feature - epel: enabled + 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 order: 10 - when: initiator == packit how: shell - script: bash contrib/tmt/update-deps.sh + 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 order: 20 -/validate: - summary: Validate test +/no-rpm: + summary: Run tests independent of rpm discover+: - test: /validate + filter: tag:no-rpm + adjust+: + - enabled: false + when: initiator is not defined or initiator != packit -/unit: - summary: Unit tests +/rpm: + summary: Run tests on the rpm discover+: - test: /unit - -/integration: - summary: Integration tests - discover+: - test: /integration - -/msrv: - summary: MSRV test - discover+: - test: /msrv + filter: tag:rpm diff --git a/sources b/sources index 554ad85..32340c6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v2.1.0.tar.gz) = 7f5b7d1823e607b19cedfe8a4f0c42616603f491c311674a998cd10df2da9d9c087d02d3ca045eb842c9bdcaeb0aaca022985a2aae9513927774ea741ca854aa -SHA512 (aardvark-dns-v2.1.0-vendor.tar.gz) = ce37fa79aabfc1d1bc1cc8db9c904930010d16eea082b9f525252294b5c318a717468729e3569cddd7c03d39f76b4627c0e09b8ea4df42bb11da588c871dd041 +SHA512 (v1.17.1.tar.gz) = f7100ebaa9cde032bdef7975a0486a47c178543c6c6e35a538f4fe71b2cec788f7ceaae715637fb7a7e706aa31144efbcd1002af8b1300b1faedd3fbada37781 +SHA512 (aardvark-dns-v1.17.1-vendor.tar.gz) = ce6768f90a731a55511fdb78f8048ed3c5ff4b058d3edfc7832430330a239b58b6250851c6a268706f24b4fc94f47afd6ce4c1e4cbb1132e0dc7a2d0127d62ff diff --git a/test/tmt/tmt/main.fmf b/test/tmt/tmt/main.fmf index 846b340..9210cc8 100644 --- a/test/tmt/tmt/main.fmf +++ b/test/tmt/tmt/main.fmf @@ -1,23 +1,20 @@ /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: @@ -27,18 +24,3 @@ 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