diff --git a/.gitignore b/.gitignore index 5bb2950..f36e502 100644 --- a/.gitignore +++ b/.gitignore @@ -1890,7 +1890,3 @@ /v5.6.0.tar.gz /v5.6.1.tar.gz /v5.6.2.tar.gz -/v5.7.0-rc1.tar.gz -/v5.7.0-rc2.tar.gz -/v5.7.0.tar.gz -/v5.7.1.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 117c7b5..54f9d8e 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -92,6 +92,9 @@ jobs: - job: copr_build trigger: commit packages: [podman-fedora] + notifications: + failure_comment: + message: "podman-next COPR build failed. @containers/packit-build please check." branch: main owner: rhcontainerbot project: podman-next @@ -105,6 +108,11 @@ jobs: targets: - fedora-all tmt_plan: "/plans/system/*" + tf_extra_params: + environments: + - artifacts: + - type: repository-file + id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo - job: tests identifier: cockpit-revdeps @@ -121,24 +129,12 @@ jobs: - artifacts: - type: repository-file id: https://copr.fedorainfracloud.org/coprs/g/cockpit/main-builds/repo/fedora-$releasever/group_cockpit-main-builds-fedora-$releasever.repo + - type: repository-file + id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo tmt: context: revdeps: "yes" - - job: tests - identifier: tmt-revdeps - trigger: pull_request - packages: [podman-fedora] - notifications: - failure_comment: - message: "tmt tests failed for commit {commit_sha}. @lsm5, @psss, @thrix please check." - targets: - - fedora-latest - fmf_url: https://github.com/teemtee/tmt - fmf_path: /plans/friends - fmf_ref: main - tmt_plan: "/podman" - - job: propose_downstream trigger: release update_release: false diff --git a/README.packit b/README.packit index 1d2f35b..fb341a1 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.dev22+gfe66fd850. +The file was generated using packit 1.11.0.post1.dev7+gfdcdf3a32. diff --git a/plans/system.fmf b/plans/system.fmf index b04c062..e41ffb8 100644 --- a/plans/system.fmf +++ b/plans/system.fmf @@ -14,6 +14,15 @@ prepare: 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: | + 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 adjust+: - enabled: false diff --git a/podman.spec b/podman.spec index 1475aed..d5f6bc5 100644 --- a/podman.spec +++ b/podman.spec @@ -15,9 +15,6 @@ %define qemu 1 # bats is included in the default repos (No epel/copr etc.) %define distro_bats 1 -%if %{?fedora} >= 43 -%define sequoia 1 -%endif %endif %if %{defined copr_username} @@ -63,7 +60,7 @@ Epoch: 5 # 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: 5.7.1 +Version: 5.6.2 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease @@ -112,10 +109,6 @@ Requires: containers-common-extra >= 5:0.58.0-1 %else Requires: containers-common-extra %endif -%if %{defined sequoia} -Requires: podman-sequoia -%endif - Obsoletes: %{name}-quadlet <= 5:4.4.0-1 Provides: %{name}-quadlet = %{epoch}:%{version}-%{release} @@ -254,7 +247,7 @@ LDFLAGS="-X %{ld_libpod}/define.buildInfo=${SOURCE_DATE_EPOCH:-$(date +%s)} \ # This variable will be set by Packit actions. See .packit.yaml in the root dir # of the repo (upstream as well as Fedora dist-git). -GIT_COMMIT="f845d14e941889ba4c071f35233d09b29d363c75" +GIT_COMMIT="9dd5e1ed33830612bc200d7a13db00af6ab865a4" LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT" # build rootlessport first @@ -272,11 +265,6 @@ export BASEBUILDTAGS="$BASEBUILDTAGS libtrust_openssl" # build %%{name} export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh)" - -%if %{defined sequoia} -export BUILDTAGS="$BUILDTAGS containers_image_sequoia" -%endif - %gobuild -o bin/%{name} ./cmd/%{name} # build %%{name}-remote diff --git a/sources b/sources index 1ab124d..1c082db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.7.1.tar.gz) = 81fd4c27ff1d16dcb85229d4e4fd2cb06943ddfe966b5324fa8a8a957b2d2ec2aed7c5da05d6c009148f53b76545b27b0cba506622c8861f70bf7cad6c214a08 +SHA512 (v5.6.2.tar.gz) = 89f819da18a95b2f7d4d3dce1c34ee3e133a42ef87a78bd3a15cb5e8affed1671a2ce134518e37ca952ddb0ce086d47ed9a84ff98b941c6d55753c402e156b95