From a799555f38c6564c53a507ae4123b53b853cab1a Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 14 Aug 2024 18:08:17 +0000 Subject: [PATCH 01/45] Update to 5.2.1 upstream release Upstream tag: v5.2.1 Upstream commit: d0582c9e Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e3c5cd3..d1392d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1864,3 +1864,4 @@ /v5.2.0-rc1.tar.gz /v5.2.0-rc2.tar.gz /v5.2.0.tar.gz +/v5.2.1.tar.gz diff --git a/README.packit b/README.packit index aeaae38..4df53f3 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.99.0.post1.dev29+g2e75e6ff. +The file was generated using packit 0.100.1. diff --git a/podman.spec b/podman.spec index 4454e7b..267a32e 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,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.2.0 +Version: 5.2.1 # 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 diff --git a/sources b/sources index ac60916..15211eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.2.0.tar.gz) = cc5ac92ebeaac03074c1221fa4cbc3ea62af95d0d444208b88368208089e146ff2693281033caaecd909a5f01fe4a3f8a199fef8c6c9901c281431011e19f729 +SHA512 (v5.2.1.tar.gz) = 62827a1bf0e3b9c59815fbdc1affc5e0524398088de90c3f2eee12208cc674daa4e3dfda3a77364f6c3d2d3c5e63a5792a7d44b19e015e30046cd593470dc410 From 38b9ee99ea9795cbba43b21ad7a1d3f2572431ae Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 21 Aug 2024 20:00:56 +0000 Subject: [PATCH 02/45] Update to 5.2.2 upstream release Upstream tag: v5.2.2 Upstream commit: fcee4810 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 3 +-- README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d1392d7..75c42b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1865,3 +1865,4 @@ /v5.2.0-rc2.tar.gz /v5.2.0.tar.gz /v5.2.1.tar.gz +/v5.2.2.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 7783371..e840b9e 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -99,8 +99,7 @@ jobs: update_release: false packages: [podman-fedora] dist_git_branches: - - fedora-development - - fedora-latest + - fedora-all - job: propose_downstream trigger: release diff --git a/README.packit b/README.packit index 4df53f3..94a5d96 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.100.1. +The file was generated using packit 0.100.2.post1.dev4+g31a74ebd. diff --git a/podman.spec b/podman.spec index 267a32e..507c5df 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,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.2.1 +Version: 5.2.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 diff --git a/sources b/sources index 15211eb..2b27ec4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.2.1.tar.gz) = 62827a1bf0e3b9c59815fbdc1affc5e0524398088de90c3f2eee12208cc674daa4e3dfda3a77364f6c3d2d3c5e63a5792a7d44b19e015e30046cd593470dc410 +SHA512 (v5.2.2.tar.gz) = a6c06689d4af80a35fa5867f8f3ea0ae3134fc40e3b3c101707842900444621337cf73eb9af42235ac5ccd12a11d707d98b29094514b00e6d6f158b4fe1f2973 From 4a3c9f78bf508d82d18ccc9a98b4e3566453bd35 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 28 Aug 2024 20:35:02 +0530 Subject: [PATCH 03/45] rebuild for shadow-utils bump Signed-off-by: Lokesh Mandvekar From 25c5d045531b0cbf1a6e3eb967702c53fa372b83 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 24 Sep 2024 15:20:02 +0000 Subject: [PATCH 04/45] Update to 5.2.3 upstream release Upstream tag: v5.2.3 Upstream commit: c5366a30 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 40 ++++++++++++++++++++++++++++++---------- README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 5 files changed, 34 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 75c42b3..5ea107a 100644 --- a/.gitignore +++ b/.gitignore @@ -1866,3 +1866,4 @@ /v5.2.0.tar.gz /v5.2.1.tar.gz /v5.2.2.tar.gz +/v5.2.3.tar.gz diff --git a/.packit.yaml b/.packit.yaml index e840b9e..cc47847 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -14,6 +14,8 @@ packages: specfile_path: rpm/podman.spec podman-rhel: specfile_path: rpm/podman.spec + podman-eln: + specfile_path: rpm/podman.spec srpm_build_deps: - git-archive-all @@ -32,8 +34,21 @@ jobs: message: "Ephemeral COPR build failed. @containers/packit-build please check." enable_net: true targets: - fedora-all-x86_64: {} - fedora-all-aarch64: {} + - fedora-development-x86_64 + - fedora-development-aarch64 + - fedora-latest-x86_64 + - fedora-latest-aarch64 + - fedora-latest-stable-x86_64 + - fedora-latest-stable-aarch64 + - fedora-40-x86_64 + - fedora-40-aarch64 + + - job: copr_build + trigger: pull_request + packages: [podman-eln] + notifications: *packit_build_failure_notification + enable_net: true + targets: fedora-eln-x86_64: additional_repos: - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/" @@ -98,7 +113,7 @@ jobs: trigger: release update_release: false packages: [podman-fedora] - dist_git_branches: + dist_git_branches: &fedora_targets - fedora-all - job: propose_downstream @@ -110,12 +125,17 @@ jobs: - job: koji_build trigger: commit - packages: [podman-fedora] - dist_git_branches: - - fedora-all + sidetag_group: podman-releases + dist_git_branches: *fedora_targets - job: bodhi_update - trigger: commit - packages: [podman-fedora] - dist_git_branches: - - fedora-branched # rawhide updates are created automatically + trigger: koji_build + sidetag_group: podman-releases + # Dependencies are not rpm dependencies, but packages that should go in the + # same bodhi update + # Ref: https://packit.dev/docs/fedora-releases-guide/releasing-multiple-packages + dependencies: + - buildah + - containers-common + - skopeo + dist_git_branches: *fedora_targets diff --git a/README.packit b/README.packit index 94a5d96..ab6dd33 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.100.2.post1.dev4+g31a74ebd. +The file was generated using packit 0.101.1. diff --git a/podman.spec b/podman.spec index 507c5df..aa41553 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,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.2.2 +Version: 5.2.3 # 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 diff --git a/sources b/sources index 2b27ec4..cee6dd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.2.2.tar.gz) = a6c06689d4af80a35fa5867f8f3ea0ae3134fc40e3b3c101707842900444621337cf73eb9af42235ac5ccd12a11d707d98b29094514b00e6d6f158b4fe1f2973 +SHA512 (v5.2.3.tar.gz) = 65aedd77f96e03a4ff06167fa44930be0929969a1f0d411c89a3981b2250b8051c975441b74b5b05f9ba0798ff41ff4fdf539b7f1849b130565e2765bb8c872b From 9ee0404bb87287919158d6c81269f3136bc9d1af Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 26 Sep 2024 16:06:59 +0530 Subject: [PATCH 05/45] rebuild --- README.packit | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.packit b/README.packit index ab6dd33..6d6c8bd 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,6 @@ This repository is maintained by packit. https://packit.dev/ The file was generated using packit 0.101.1. + +https://bodhi.fedoraproject.org/updates/FEDORA-2024-00126b6886 is stuck in +pending. Edit README.packit to create dist-git PR for rebuild. From 2ea42c0f0b6dcf9a2ba62aa75295d2bb945ea16e Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 7 Oct 2024 16:05:36 +0000 Subject: [PATCH 06/45] Update to 5.2.4 upstream release Upstream tag: v5.2.4 Upstream commit: 76d0859d Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 5 +---- podman.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5ea107a..bc8e9b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1867,3 +1867,4 @@ /v5.2.1.tar.gz /v5.2.2.tar.gz /v5.2.3.tar.gz +/v5.2.4.tar.gz diff --git a/README.packit b/README.packit index 6d6c8bd..766e300 100644 --- a/README.packit +++ b/README.packit @@ -1,6 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.101.1. - -https://bodhi.fedoraproject.org/updates/FEDORA-2024-00126b6886 is stuck in -pending. Edit README.packit to create dist-git PR for rebuild. +The file was generated using packit 0.101.1.post1.dev8+ge78e9e3b. diff --git a/podman.spec b/podman.spec index aa41553..fdccb84 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,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.2.3 +Version: 5.2.4 # 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 diff --git a/sources b/sources index cee6dd4..4598fa3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.2.3.tar.gz) = 65aedd77f96e03a4ff06167fa44930be0929969a1f0d411c89a3981b2250b8051c975441b74b5b05f9ba0798ff41ff4fdf539b7f1849b130565e2765bb8c872b +SHA512 (v5.2.4.tar.gz) = c6dc05cb377ba6ca3bf7a8d7875c97af9e82b972812702e011e41f7922a4546166061dd5fb809fbef9dd13ee233744de7b7fe16906d8d9631133fc4205a980c5 From 7d7eeff1c693b2d6ff14edbd0a115cd996216a97 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 15 Oct 2024 13:21:58 +0530 Subject: [PATCH 07/45] c/common pr 2194 --- ...-upstream-c-common-PR-2194-to-podman.patch | 31 +++++++++++++++++++ podman.spec | 6 +--- 2 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 0001-upstream-c-common-PR-2194-to-podman.patch diff --git a/0001-upstream-c-common-PR-2194-to-podman.patch b/0001-upstream-c-common-PR-2194-to-podman.patch new file mode 100644 index 0000000..1dcb477 --- /dev/null +++ b/0001-upstream-c-common-PR-2194-to-podman.patch @@ -0,0 +1,31 @@ +From 197741e4fa3510a14e78f572677d3b9154419cab Mon Sep 17 00:00:00 2001 +From: Lokesh Mandvekar +Date: Tue, 15 Oct 2024 13:17:50 +0530 +Subject: [PATCH] upstream c/common PR 2194 to podman + +Signed-off-by: Lokesh Mandvekar +--- + vendor/github.com/containers/common/pkg/config/default.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go +index 311b090b9..044748ab0 100644 +--- a/vendor/github.com/containers/common/pkg/config/default.go ++++ b/vendor/github.com/containers/common/pkg/config/default.go +@@ -120,12 +120,12 @@ var ( + additionalHelperBinariesDir string + + defaultUnixComposeProviders = []string{ +- "docker-compose", + "$HOME/.docker/cli-plugins/docker-compose", + "/usr/local/lib/docker/cli-plugins/docker-compose", + "/usr/local/libexec/docker/cli-plugins/docker-compose", + "/usr/lib/docker/cli-plugins/docker-compose", + "/usr/libexec/docker/cli-plugins/docker-compose", ++ "docker-compose", + "podman-compose", + } + +-- +2.47.0 + diff --git a/podman.spec b/podman.spec index fdccb84..5379c14 100644 --- a/podman.spec +++ b/podman.spec @@ -65,6 +65,7 @@ Summary: Manage Pods, Containers and Container Images URL: https://%{name}.io/ # All SourceN files fetched from upstream Source0: %{git0}/archive/v%{version_no_tilde}.tar.gz +Patch0: 0001-upstream-c-common-PR-2194-to-podman.patch Provides: %{name}-manpages = %{epoch}:%{version}-%{release} BuildRequires: %{_bindir}/envsubst %if %{defined build_with_btrfs} @@ -341,9 +342,4 @@ ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name} %{_libexecdir}/%{name}/virtiofsd %changelog -%if %{defined autochangelog} %autochangelog -%else -* Mon May 01 2023 RH Container Bot -- Placeholder changelog for envs that are not autochangelog-ready -%endif From 5f0570428b859349f0f7c71d3b49238e96de76fb Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 18 Oct 2024 23:10:27 +0530 Subject: [PATCH 08/45] bump to v5.2.5 Fixes: #2317464 - Security fix for CVE-2024-9675 Fixes: #2319019 - Security fix for CVE-2024-9676 Fixes: #2318511 - Security fix for CVE-2024-9341 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bc8e9b2..6e97bf3 100644 --- a/.gitignore +++ b/.gitignore @@ -1868,3 +1868,4 @@ /v5.2.2.tar.gz /v5.2.3.tar.gz /v5.2.4.tar.gz +/v5.2.5.tar.gz diff --git a/podman.spec b/podman.spec index 5379c14..53e0b24 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,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.2.4 +Version: 5.2.5 # 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 diff --git a/sources b/sources index 4598fa3..27aeb20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.2.4.tar.gz) = c6dc05cb377ba6ca3bf7a8d7875c97af9e82b972812702e011e41f7922a4546166061dd5fb809fbef9dd13ee233744de7b7fe16906d8d9631133fc4205a980c5 +SHA512 (v5.2.5.tar.gz) = 29f71c67a5700e8dffe45e6e91acab509d8c8924a5f3cf9b4eee95f665a9ed19333285df89da892699ee314cee27c0c8a4a62d29e4205198781f5d5f585135a9 From e7af4c8ac5d3b5d21a0846583f051eb0a23ed893 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 22 Oct 2024 15:58:40 +0000 Subject: [PATCH 09/45] Update to 5.3.0-rc1 upstream release Upstream tag: v5.3.0-rc1 Upstream commit: d306e801 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 23 +++++++++++++---------- README.packit | 2 +- podman.spec | 15 ++++++++------- sources | 2 +- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 6e97bf3..bf2b1ef 100644 --- a/.gitignore +++ b/.gitignore @@ -1869,3 +1869,4 @@ /v5.2.3.tar.gz /v5.2.4.tar.gz /v5.2.5.tar.gz +/v5.3.0-rc1.tar.gz diff --git a/.packit.yaml b/.packit.yaml index cc47847..0d5c3a3 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -62,19 +62,20 @@ jobs: notifications: *packit_build_failure_notification enable_net: true targets: - - centos-stream-9-x86_64 - - centos-stream-9-aarch64 + # - centos-stream-9-x86_64 + # - centos-stream-9-aarch64 - centos-stream-10-x86_64 - centos-stream-10-aarch64 - - job: copr_build - trigger: pull_request - packages: [podman-rhel] - notifications: *packit_build_failure_notification - enable_net: true - targets: - - epel-9-x86_64 - - epel-9-aarch64 + # Disabled until there is go 1.22 in epel-9 + # - job: copr_build + # trigger: pull_request + # packages: [podman-rhel] + # notifications: *packit_build_failure_notification + # enable_net: true + # targets: + # - epel-9-x86_64 + # - epel-9-aarch64 # Run on commit to main branch - job: copr_build @@ -125,11 +126,13 @@ jobs: - job: koji_build trigger: commit + packages: [podman-fedora] sidetag_group: podman-releases dist_git_branches: *fedora_targets - job: bodhi_update trigger: koji_build + packages: [podman-fedora] sidetag_group: podman-releases # Dependencies are not rpm dependencies, but packages that should go in the # same bodhi update diff --git a/README.packit b/README.packit index 766e300..2bd3f40 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.101.1.post1.dev8+ge78e9e3b. +The file was generated using packit 0.102.1.post1.dev6+g64f7460b. diff --git a/podman.spec b/podman.spec index 53e0b24..fd6a6ae 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,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.2.5 +Version: 5.3.0~rc1 # 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 @@ -65,7 +65,6 @@ Summary: Manage Pods, Containers and Container Images URL: https://%{name}.io/ # All SourceN files fetched from upstream Source0: %{git0}/archive/v%{version_no_tilde}.tar.gz -Patch0: 0001-upstream-c-common-PR-2194-to-podman.patch Provides: %{name}-manpages = %{epoch}:%{version}-%{release} BuildRequires: %{_bindir}/envsubst %if %{defined build_with_btrfs} @@ -102,7 +101,6 @@ Requires: containers-common-extra >= 5:0.58.0-1 %else Requires: containers-common-extra %endif -Provides: %{name}-quadlet Obsoletes: %{name}-quadlet <= 5:4.4.0-1 Provides: %{name}-quadlet = %{epoch}:%{version}-%{release} @@ -267,15 +265,15 @@ PODMAN_VERSION=%{version} %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} ETCDI install.remote \ install.testing -# Only need this on Fedora until nftables becomes the default -%if %{defined fedora} +# See above for the iptables.conf declaration +%if %{defined fedora} && 0%{?fedora} < 41 %{__make} DESTDIR=%{buildroot} MODULESLOADDIR=%{_modulesloaddir} install.modules-load %endif sed -i 's;%{buildroot};;g' %{buildroot}%{_bindir}/docker # do not include docker and podman-remote man pages in main package -for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},," | grep -v -e %{name}sh.1 -e remote -e docker`; do +for file in `find %{buildroot}%{_mandir}/man[157] -type f | sed "s,%{buildroot},," | grep -v -e %{name}sh.1 -e remote -e docker`; do echo "$file*" >> %{name}.file-list done @@ -308,7 +306,10 @@ ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name} %{_tmpfilesdir}/%{name}.conf %{_systemdgeneratordir}/%{name}-system-generator %{_systemdusergeneratordir}/%{name}-user-generator -%if %{defined fedora} +# iptables modules are only needed with iptables-legacy, +# as of f41 netavark will default to nftables so do not load unessary modules +# https://fedoraproject.org/wiki/Changes/NetavarkNftablesDefault +%if %{defined fedora} && 0%{?fedora} < 41 %{_modulesloaddir}/%{name}-iptables.conf %endif diff --git a/sources b/sources index 27aeb20..8f7476e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.2.5.tar.gz) = 29f71c67a5700e8dffe45e6e91acab509d8c8924a5f3cf9b4eee95f665a9ed19333285df89da892699ee314cee27c0c8a4a62d29e4205198781f5d5f585135a9 +SHA512 (v5.3.0-rc1.tar.gz) = dce8c2cd8bf10dd89353fe6553526e2bf937c883b80d4b76dc8d98e16901713038cc385668316abb40e620769afeb95d69686b4978bd81ca7f32d875b986e98b From 3565da350cf306cacb2189d513d1d34282812db3 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 31 Oct 2024 13:55:03 +0000 Subject: [PATCH 10/45] Update to 5.3.0-rc2 upstream release Upstream tag: v5.3.0-rc2 Upstream commit: ffad01fb Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bf2b1ef..b37f5d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1870,3 +1870,4 @@ /v5.2.4.tar.gz /v5.2.5.tar.gz /v5.3.0-rc1.tar.gz +/v5.3.0-rc2.tar.gz diff --git a/README.packit b/README.packit index 2bd3f40..3d207b6 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.102.1.post1.dev6+g64f7460b. +The file was generated using packit 0.102.2.post1.dev2+gbdca14cb. diff --git a/podman.spec b/podman.spec index fd6a6ae..c1e9c68 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,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.3.0~rc1 +Version: 5.3.0~rc2 # 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 diff --git a/sources b/sources index 8f7476e..dcb5bee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.3.0-rc1.tar.gz) = dce8c2cd8bf10dd89353fe6553526e2bf937c883b80d4b76dc8d98e16901713038cc385668316abb40e620769afeb95d69686b4978bd81ca7f32d875b986e98b +SHA512 (v5.3.0-rc2.tar.gz) = 1b8d93a5b8589c8ba8f89951dbd28fc8905b3cd34a438a74219dbeef5130e2774f765d89a3e11b4a7442dd6175bcf97b8365ab6d6435af52641a9b7386642446 From 12291ee7a73eaa4ab29f69bf892b332eb56c1b20 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 6 Nov 2024 19:17:42 +0000 Subject: [PATCH 11/45] Update to 5.3.0-rc3 upstream release Upstream tag: v5.3.0-rc3 Upstream commit: 8469dcc4 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b37f5d6..43e998c 100644 --- a/.gitignore +++ b/.gitignore @@ -1871,3 +1871,4 @@ /v5.2.5.tar.gz /v5.3.0-rc1.tar.gz /v5.3.0-rc2.tar.gz +/v5.3.0-rc3.tar.gz diff --git a/README.packit b/README.packit index 3d207b6..1b4760d 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.102.2.post1.dev2+gbdca14cb. +The file was generated using packit 0.102.2.post1.dev4+g3142fcf8. diff --git a/podman.spec b/podman.spec index c1e9c68..a8fc62e 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,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.3.0~rc2 +Version: 5.3.0~rc3 # 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 diff --git a/sources b/sources index dcb5bee..ae7bd4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.3.0-rc2.tar.gz) = 1b8d93a5b8589c8ba8f89951dbd28fc8905b3cd34a438a74219dbeef5130e2774f765d89a3e11b4a7442dd6175bcf97b8365ab6d6435af52641a9b7386642446 +SHA512 (v5.3.0-rc3.tar.gz) = d546d7424cab430c6de477bc4819ac11d87f521c17aa31c82ced92e66f2fe7d7fff54f66591b3d5b79cab513ab398997236e962bc539a5fe3eea32f0cc34e8c8 From dc0e6a1b2e41bbf3bdb0854b43990e3fa89ee166 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 13 Nov 2024 13:17:16 +0000 Subject: [PATCH 12/45] Update to 5.3.0 upstream release Upstream tag: v5.3.0 Upstream commit: 874bf2c3 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 43e998c..cf680ab 100644 --- a/.gitignore +++ b/.gitignore @@ -1872,3 +1872,4 @@ /v5.3.0-rc1.tar.gz /v5.3.0-rc2.tar.gz /v5.3.0-rc3.tar.gz +/v5.3.0.tar.gz diff --git a/README.packit b/README.packit index 1b4760d..c18262a 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.102.2.post1.dev4+g3142fcf8. +The file was generated using packit 0.103.0. diff --git a/podman.spec b/podman.spec index a8fc62e..4746ac2 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,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.3.0~rc3 +Version: 5.3.0 # 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 diff --git a/sources b/sources index ae7bd4d..5ebad65 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.3.0-rc3.tar.gz) = d546d7424cab430c6de477bc4819ac11d87f521c17aa31c82ced92e66f2fe7d7fff54f66591b3d5b79cab513ab398997236e962bc539a5fe3eea32f0cc34e8c8 +SHA512 (v5.3.0.tar.gz) = 3f1ab7e792850e2e21823c59ca9e03d348e78267e3ec5344a04c38e51466159717944c318cf5e61ad9a785d9112b468b9fc37f3b60a40e8764d5cac9f58e7d16 From bedd327f6d5d4c692d9a0e7c0cae191c2d736aea Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 21 Nov 2024 15:42:16 +0000 Subject: [PATCH 13/45] Update to 5.3.1 upstream release Upstream tag: v5.3.1 Upstream commit: 4cbdfde5 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cf680ab..b7c1afc 100644 --- a/.gitignore +++ b/.gitignore @@ -1873,3 +1873,4 @@ /v5.3.0-rc2.tar.gz /v5.3.0-rc3.tar.gz /v5.3.0.tar.gz +/v5.3.1.tar.gz diff --git a/README.packit b/README.packit index c18262a..58044ba 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.103.0. +The file was generated using packit 0.104.0. diff --git a/podman.spec b/podman.spec index 4746ac2..345e113 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,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.3.0 +Version: 5.3.1 # 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 diff --git a/sources b/sources index 5ebad65..31b1d65 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.3.0.tar.gz) = 3f1ab7e792850e2e21823c59ca9e03d348e78267e3ec5344a04c38e51466159717944c318cf5e61ad9a785d9112b468b9fc37f3b60a40e8764d5cac9f58e7d16 +SHA512 (v5.3.1.tar.gz) = e865104453cc2d7e3d76c83da84dbd6c4fb5224b089059d3eca3cbe3b5513e7964000eb66a2c6ac80ad09b3392d24900fe314bb464cdcc80b0dd6a74b6ea9262 From 89aed9941f2fa774249a55c3082ff9a3932c1022 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 27 Nov 2024 20:48:48 +0530 Subject: [PATCH 14/45] remove unused patch Signed-off-by: Lokesh Mandvekar --- ...-upstream-c-common-PR-2194-to-podman.patch | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 0001-upstream-c-common-PR-2194-to-podman.patch diff --git a/0001-upstream-c-common-PR-2194-to-podman.patch b/0001-upstream-c-common-PR-2194-to-podman.patch deleted file mode 100644 index 1dcb477..0000000 --- a/0001-upstream-c-common-PR-2194-to-podman.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 197741e4fa3510a14e78f572677d3b9154419cab Mon Sep 17 00:00:00 2001 -From: Lokesh Mandvekar -Date: Tue, 15 Oct 2024 13:17:50 +0530 -Subject: [PATCH] upstream c/common PR 2194 to podman - -Signed-off-by: Lokesh Mandvekar ---- - vendor/github.com/containers/common/pkg/config/default.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go -index 311b090b9..044748ab0 100644 ---- a/vendor/github.com/containers/common/pkg/config/default.go -+++ b/vendor/github.com/containers/common/pkg/config/default.go -@@ -120,12 +120,12 @@ var ( - additionalHelperBinariesDir string - - defaultUnixComposeProviders = []string{ -- "docker-compose", - "$HOME/.docker/cli-plugins/docker-compose", - "/usr/local/lib/docker/cli-plugins/docker-compose", - "/usr/local/libexec/docker/cli-plugins/docker-compose", - "/usr/lib/docker/cli-plugins/docker-compose", - "/usr/libexec/docker/cli-plugins/docker-compose", -+ "docker-compose", - "podman-compose", - } - --- -2.47.0 - From 6889e093102bc0d22ee0eac1f8ffeabde19ef0c2 Mon Sep 17 00:00:00 2001 From: Mikhail Gavrilov Date: Thu, 9 Jan 2025 05:52:53 +0500 Subject: [PATCH 15/45] apply MR https://github.com/containers/storage/pull/2193 --- 2193.patch | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++ podman.spec | 1 + 2 files changed, 84 insertions(+) create mode 100644 2193.patch diff --git a/2193.patch b/2193.patch new file mode 100644 index 0000000..fc7ba08 --- /dev/null +++ b/2193.patch @@ -0,0 +1,83 @@ +From 359b5d5c748876b20b6cbdd28d8df43b27bc71b5 Mon Sep 17 00:00:00 2001 +From: Paul Holzinger +Date: Tue, 3 Dec 2024 14:09:02 +0100 +Subject: [PATCH] store: correctly remove incomplete layers on load. + +In go one should never modify a slice while also iterating over it at +the same time. This causes weird side effects as the underlying array +elements are shifted around without the range loop index knowing. +So if you delete a element the loop will then actually skip the next one +and theoretically access out of bounds on the last element which does +not panic but rather return the default zero type, nil here which then +causes the panic on layer.Flags == nil. + +Here is a simple example to show the behavior: +func main() { + slice := []int{1, 2, 3, 4, 5, 6, 7, 8, 9} + for _, num := range slice { + if num == 5 { + slice = slices.DeleteFunc(slice, func(n int) bool { + return n == 5 + }) + } + fmt.Println(num) + } +} + +The loop will not print 6, but then as last number it prints 0 (the +default zero type for an int). + +Fixes #2184 + +Signed-off-by: Paul Holzinger +(cherry picked from commit 99b0d2d423c8093807d8a1464437152cd04d7d95) +--- + layers.go | 29 +++++++++++++++++++---------- + 1 file changed, 19 insertions(+), 10 deletions(-) + +diff --git a/vendor/github.com/containers/storage/layers.go b/vendor/github.com/containers/storage/layers.go +index 6fe1a08035..4769e581ae 100644 +--- a/vendor/github.com/containers/storage/layers.go ++++ b/vendor/github.com/containers/storage/layers.go +@@ -913,22 +913,31 @@ func (r *layerStore) load(lockedForWriting bool) (bool, error) { + // user of this storage area marked for deletion but didn't manage to + // actually delete. + var incompleteDeletionErrors error // = nil ++ var layersToDelete []*Layer + for _, layer := range r.layers { + if layer.Flags == nil { + layer.Flags = make(map[string]interface{}) + } + if layerHasIncompleteFlag(layer) { +- logrus.Warnf("Found incomplete layer %#v, deleting it", layer.ID) +- err := r.deleteInternal(layer.ID) +- if err != nil { +- // Don't return the error immediately, because deleteInternal does not saveLayers(); +- // Even if deleting one incomplete layer fails, call saveLayers() so that other possible successfully +- // deleted incomplete layers have their metadata correctly removed. +- incompleteDeletionErrors = multierror.Append(incompleteDeletionErrors, +- fmt.Errorf("deleting layer %#v: %w", layer.ID, err)) +- } +- modifiedLocations |= layerLocation(layer) ++ // Important: Do not call r.deleteInternal() here. It modifies r.layers ++ // which causes unexpected side effects while iterating over r.layers here. ++ // The range loop has no idea that the underlying elements where shifted ++ // around. ++ layersToDelete = append(layersToDelete, layer) ++ } ++ } ++ // Now actually delete the layers ++ for _, layer := range layersToDelete { ++ logrus.Warnf("Found incomplete layer %q, deleting it", layer.ID) ++ err := r.deleteInternal(layer.ID) ++ if err != nil { ++ // Don't return the error immediately, because deleteInternal does not saveLayers(); ++ // Even if deleting one incomplete layer fails, call saveLayers() so that other possible successfully ++ // deleted incomplete layers have their metadata correctly removed. ++ incompleteDeletionErrors = multierror.Append(incompleteDeletionErrors, ++ fmt.Errorf("deleting layer %#v: %w", layer.ID, err)) + } ++ modifiedLocations |= layerLocation(layer) + } + if err := r.saveLayers(modifiedLocations); err != nil { + return false, err diff --git a/podman.spec b/podman.spec index 345e113..da478f1 100644 --- a/podman.spec +++ b/podman.spec @@ -65,6 +65,7 @@ Summary: Manage Pods, Containers and Container Images URL: https://%{name}.io/ # All SourceN files fetched from upstream Source0: %{git0}/archive/v%{version_no_tilde}.tar.gz +Patch0: 2193.patch Provides: %{name}-manpages = %{epoch}:%{version}-%{release} BuildRequires: %{_bindir}/envsubst %if %{defined build_with_btrfs} From 935369422c1d16ed4d6cd7297fd9dcf2d17f2c59 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 10:29:23 +0000 Subject: [PATCH 16/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 4045fdac88a718fae986d0469b2756a3bbac1d12 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 22 Jan 2025 19:03:53 +0530 Subject: [PATCH 17/45] remove patch merged in upcoming upstream release Signed-off-by: Lokesh Mandvekar --- 2193.patch | 83 ----------------------------------------------------- podman.spec | 1 - 2 files changed, 84 deletions(-) delete mode 100644 2193.patch diff --git a/2193.patch b/2193.patch deleted file mode 100644 index fc7ba08..0000000 --- a/2193.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 359b5d5c748876b20b6cbdd28d8df43b27bc71b5 Mon Sep 17 00:00:00 2001 -From: Paul Holzinger -Date: Tue, 3 Dec 2024 14:09:02 +0100 -Subject: [PATCH] store: correctly remove incomplete layers on load. - -In go one should never modify a slice while also iterating over it at -the same time. This causes weird side effects as the underlying array -elements are shifted around without the range loop index knowing. -So if you delete a element the loop will then actually skip the next one -and theoretically access out of bounds on the last element which does -not panic but rather return the default zero type, nil here which then -causes the panic on layer.Flags == nil. - -Here is a simple example to show the behavior: -func main() { - slice := []int{1, 2, 3, 4, 5, 6, 7, 8, 9} - for _, num := range slice { - if num == 5 { - slice = slices.DeleteFunc(slice, func(n int) bool { - return n == 5 - }) - } - fmt.Println(num) - } -} - -The loop will not print 6, but then as last number it prints 0 (the -default zero type for an int). - -Fixes #2184 - -Signed-off-by: Paul Holzinger -(cherry picked from commit 99b0d2d423c8093807d8a1464437152cd04d7d95) ---- - layers.go | 29 +++++++++++++++++++---------- - 1 file changed, 19 insertions(+), 10 deletions(-) - -diff --git a/vendor/github.com/containers/storage/layers.go b/vendor/github.com/containers/storage/layers.go -index 6fe1a08035..4769e581ae 100644 ---- a/vendor/github.com/containers/storage/layers.go -+++ b/vendor/github.com/containers/storage/layers.go -@@ -913,22 +913,31 @@ func (r *layerStore) load(lockedForWriting bool) (bool, error) { - // user of this storage area marked for deletion but didn't manage to - // actually delete. - var incompleteDeletionErrors error // = nil -+ var layersToDelete []*Layer - for _, layer := range r.layers { - if layer.Flags == nil { - layer.Flags = make(map[string]interface{}) - } - if layerHasIncompleteFlag(layer) { -- logrus.Warnf("Found incomplete layer %#v, deleting it", layer.ID) -- err := r.deleteInternal(layer.ID) -- if err != nil { -- // Don't return the error immediately, because deleteInternal does not saveLayers(); -- // Even if deleting one incomplete layer fails, call saveLayers() so that other possible successfully -- // deleted incomplete layers have their metadata correctly removed. -- incompleteDeletionErrors = multierror.Append(incompleteDeletionErrors, -- fmt.Errorf("deleting layer %#v: %w", layer.ID, err)) -- } -- modifiedLocations |= layerLocation(layer) -+ // Important: Do not call r.deleteInternal() here. It modifies r.layers -+ // which causes unexpected side effects while iterating over r.layers here. -+ // The range loop has no idea that the underlying elements where shifted -+ // around. -+ layersToDelete = append(layersToDelete, layer) -+ } -+ } -+ // Now actually delete the layers -+ for _, layer := range layersToDelete { -+ logrus.Warnf("Found incomplete layer %q, deleting it", layer.ID) -+ err := r.deleteInternal(layer.ID) -+ if err != nil { -+ // Don't return the error immediately, because deleteInternal does not saveLayers(); -+ // Even if deleting one incomplete layer fails, call saveLayers() so that other possible successfully -+ // deleted incomplete layers have their metadata correctly removed. -+ incompleteDeletionErrors = multierror.Append(incompleteDeletionErrors, -+ fmt.Errorf("deleting layer %#v: %w", layer.ID, err)) - } -+ modifiedLocations |= layerLocation(layer) - } - if err := r.saveLayers(modifiedLocations); err != nil { - return false, err diff --git a/podman.spec b/podman.spec index da478f1..345e113 100644 --- a/podman.spec +++ b/podman.spec @@ -65,7 +65,6 @@ Summary: Manage Pods, Containers and Container Images URL: https://%{name}.io/ # All SourceN files fetched from upstream Source0: %{git0}/archive/v%{version_no_tilde}.tar.gz -Patch0: 2193.patch Provides: %{name}-manpages = %{epoch}:%{version}-%{release} BuildRequires: %{_bindir}/envsubst %if %{defined build_with_btrfs} From 17ae2ac263408d0244d3ee8f2e7281a77017eb80 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 22 Jan 2025 13:39:33 +0000 Subject: [PATCH 18/45] Update to 5.3.2 upstream release Upstream tag: v5.3.2 Upstream commit: 85043bb1 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 26 ++++---------------------- README.packit | 2 +- podman.spec | 11 ++++++++++- sources | 2 +- 5 files changed, 17 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index b7c1afc..512967d 100644 --- a/.gitignore +++ b/.gitignore @@ -1874,3 +1874,4 @@ /v5.3.0-rc3.tar.gz /v5.3.0.tar.gz /v5.3.1.tar.gz +/v5.3.2.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 0d5c3a3..637e020 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -12,8 +12,6 @@ packages: podman-centos: pkg_tool: centpkg specfile_path: rpm/podman.spec - podman-rhel: - specfile_path: rpm/podman.spec podman-eln: specfile_path: rpm/podman.spec @@ -34,14 +32,8 @@ jobs: message: "Ephemeral COPR build failed. @containers/packit-build please check." enable_net: true targets: - - fedora-development-x86_64 - - fedora-development-aarch64 - - fedora-latest-x86_64 - - fedora-latest-aarch64 - - fedora-latest-stable-x86_64 - - fedora-latest-stable-aarch64 - - fedora-40-x86_64 - - fedora-40-aarch64 + - fedora-all-x86_64 + - fedora-all-aarch64 - job: copr_build trigger: pull_request @@ -62,21 +54,11 @@ jobs: notifications: *packit_build_failure_notification enable_net: true targets: - # - centos-stream-9-x86_64 - # - centos-stream-9-aarch64 + - centos-stream-9-x86_64 + - centos-stream-9-aarch64 - centos-stream-10-x86_64 - centos-stream-10-aarch64 - # Disabled until there is go 1.22 in epel-9 - # - job: copr_build - # trigger: pull_request - # packages: [podman-rhel] - # notifications: *packit_build_failure_notification - # enable_net: true - # targets: - # - epel-9-x86_64 - # - epel-9-aarch64 - # Run on commit to main branch - job: copr_build trigger: commit diff --git a/README.packit b/README.packit index 58044ba..8c905b9 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.104.0. +The file was generated using packit 0.106.0.post1.dev8+g521f1e1d. diff --git a/podman.spec b/podman.spec index 345e113..5aee7ce 100644 --- a/podman.spec +++ b/podman.spec @@ -40,6 +40,9 @@ # %%{name} %global git0 %{container_base_url}/%{name} +# podman-machine subpackage will be present only on these architectures +%global machine_arches x86_64 aarch64 + Name: podman %if %{defined copr_build} Epoch: 102 @@ -52,7 +55,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.3.1 +Version: 5.3.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 @@ -179,6 +182,7 @@ capabilities specified in user quadlets. It is a symlink to %{_bindir}/%{name} and execs into the `%{name}sh` container when `%{_bindir}/%{name}sh` is set as a login shell or set as os.Args[0]. +%ifarch %{machine_arches} %package machine Summary: Metapackage for setting up %{name} machine Requires: %{name} = %{epoch}:%{version}-%{release} @@ -189,6 +193,7 @@ Requires: virtiofsd %description machine This subpackage installs the dependencies for %{name} machine, for more see: https://docs.podman.io/en/latest/markdown/podman-machine.1.html +%endif %prep %autosetup -Sgit -n %{name}-%{version_no_tilde} @@ -282,8 +287,10 @@ rm -f %{buildroot}%{_mandir}/man5/docker*.5 install -d -p %{buildroot}%{_datadir}/%{name}/test/system cp -pav test/system %{buildroot}%{_datadir}/%{name}/test/ +%ifarch %{machine_arches} # symlink virtiofsd in %%{name} libexecdir for machine subpackage ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name} +%endif #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -338,9 +345,11 @@ ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name} %{_bindir}/%{name}sh %{_mandir}/man1/%{name}sh.1* +%ifarch %{machine_arches} %files machine %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/virtiofsd +%endif %changelog %autochangelog diff --git a/sources b/sources index 31b1d65..2e9b8fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.3.1.tar.gz) = e865104453cc2d7e3d76c83da84dbd6c4fb5224b089059d3eca3cbe3b5513e7964000eb66a2c6ac80ad09b3392d24900fe314bb464cdcc80b0dd6a74b6ea9262 +SHA512 (v5.3.2.tar.gz) = b7007278dd3f493bd0d0185ed4328570d5af527d4864c4435e7b330543d60ba87f04f36c94407d4e11e622a4af8b6467f66474e9b66cbeacb8eecb3088b4439e From 3a51c052c8086f11e41dadc1cb3efd8827c11a59 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 30 Jan 2025 13:35:33 +0000 Subject: [PATCH 19/45] Update to 5.4.0-rc2 upstream release Upstream tag: v5.4.0-rc2 Upstream commit: 14f6a69d Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 3 ++- sources | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 512967d..e394912 100644 --- a/.gitignore +++ b/.gitignore @@ -1875,3 +1875,4 @@ /v5.3.0.tar.gz /v5.3.1.tar.gz /v5.3.2.tar.gz +/v5.4.0-rc2.tar.gz diff --git a/README.packit b/README.packit index 8c905b9..5732d6a 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.106.0.post1.dev8+g521f1e1d. +The file was generated using packit 1.0.1. diff --git a/podman.spec b/podman.spec index 5aee7ce..d8c58d1 100644 --- a/podman.spec +++ b/podman.spec @@ -55,7 +55,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.3.2 +Version: 5.4.0~rc2 # 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 @@ -189,6 +189,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} Requires: gvisor-tap-vsock Requires: qemu Requires: virtiofsd +ExclusiveArch: x86_64 aarch64 %description machine This subpackage installs the dependencies for %{name} machine, for more see: diff --git a/sources b/sources index 2e9b8fb..88bca5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.3.2.tar.gz) = b7007278dd3f493bd0d0185ed4328570d5af527d4864c4435e7b330543d60ba87f04f36c94407d4e11e622a4af8b6467f66474e9b66cbeacb8eecb3088b4439e +SHA512 (v5.4.0-rc2.tar.gz) = 74c6e59489e4fc473f23c4642e72bd60c434a4160b871b47032d95b8a06e73ad7d1032299f8a421a42084b3fd7d090afbfd2688781dc4753986bbeb3a686e523 From 3713b0f06874557933ef55545235793792257272 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 4 Feb 2025 16:25:42 +0530 Subject: [PATCH 20/45] TMT: initial enablement Remove STI test triggers in favor of TMT. The upstream TMT enablement PR is at https://github.com/containers/podman/pull/24369 . The Fedora PR can be merged independently of upstream so we can get rid of STI asap. Toolbox tests are fetched from its own dist-git. Signed-off-by: Lokesh Mandvekar --- .fmf/version | 1 + .packit.yaml | 74 +++++++++++++++- gating.yaml | 7 ++ plans/cockpit-podman.fmf | 37 ++++++++ plans/system.fmf | 56 ++++++++++++ plans/tmt.fmf | 29 +++++++ plans/toolbox.fmf | 13 +++ test/tmt/system.fmf | 48 ++++++++++ test/tmt/system.sh | 43 +++++++++ test/tmt/tmt-envvars | 20 +++++ test/tmt/tmt.fmf | 14 +++ tests/README | 18 ---- tests/check_results.yml | 36 -------- .../files/disable_systemd_resolved.sh | 41 --------- .../disable_systemd_resolved/tasks/main.yml | 3 - .../roles/rootless_user_ready/tasks/main.yml | 14 --- .../run_bats_tests/files/run_bats_tests.sh | 73 ---------------- tests/roles/run_bats_tests/tasks/main.yml | 10 --- .../run_bats_tests/tasks/run_one_test.yml | 87 ------------------- tests/run_podman_tests.yml | 29 ------- tests/test_podman.yml | 39 --------- tests/test_toolbx.yml | 11 --- tests/tests.yml | 1 - 23 files changed, 340 insertions(+), 364 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/cockpit-podman.fmf create mode 100644 plans/system.fmf create mode 100644 plans/tmt.fmf create mode 100644 plans/toolbox.fmf create mode 100644 test/tmt/system.fmf create mode 100644 test/tmt/system.sh create mode 100644 test/tmt/tmt-envvars create mode 100644 test/tmt/tmt.fmf delete mode 100644 tests/README delete mode 100644 tests/check_results.yml delete mode 100755 tests/roles/disable_systemd_resolved/files/disable_systemd_resolved.sh delete mode 100644 tests/roles/disable_systemd_resolved/tasks/main.yml delete mode 100644 tests/roles/rootless_user_ready/tasks/main.yml delete mode 100755 tests/roles/run_bats_tests/files/run_bats_tests.sh delete mode 100644 tests/roles/run_bats_tests/tasks/main.yml delete mode 100644 tests/roles/run_bats_tests/tasks/run_one_test.yml delete mode 100644 tests/run_podman_tests.yml delete mode 100644 tests/test_podman.yml delete mode 100644 tests/test_toolbx.yml delete mode 100644 tests/tests.yml 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/.packit.yaml b/.packit.yaml index 637e020..09334de 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -5,6 +5,27 @@ downstream_package_name: podman 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 + mkpath: true + - src: test/tmt/ + dest: test/tmt/ + delete: true + mkpath: true + - src: .fmf/ + dest: .fmf/ + delete: true + - .packit.yaml + packages: podman-fedora: pkg_tool: fedpkg @@ -31,7 +52,7 @@ jobs: failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." enable_net: true - targets: + targets: &fedora_copr_targets - fedora-all-x86_64 - fedora-all-aarch64 @@ -53,7 +74,7 @@ jobs: packages: [podman-centos] notifications: *packit_build_failure_notification enable_net: true - targets: + targets: ¢os_copr_targets - centos-stream-9-x86_64 - centos-stream-9-aarch64 - centos-stream-10-x86_64 @@ -71,6 +92,55 @@ jobs: project: podman-next enable_net: true + - job: tests + trigger: pull_request + packages: [podman-fedora] + targets: *fedora_copr_targets + require: &dev_tests + label: + absent: + - release + 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 + identifier: "dev" + + - job: tests + trigger: pull_request + packages: [podman-fedora] + targets: *fedora_copr_targets + require: &release_tests + label: + present: + - release + preserve_project: true + identifier: "release" + + # FIXME: Enable centos stream tests after containers-common is fixed + # FIXME: centos stream 10 currently also lacks bats + # https://bugzilla.redhat.com/show_bug.cgi?id=2329315 + - job: tests + trigger: ignore + packages: [podman-centos] + targets: *centos_copr_targets + require: *dev_tests + 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 + identifier: "dev" + + - job: tests + trigger: ignore + packages: [podman-centos] + targets: *centos_copr_targets + require: *release_tests + preserve_project: true + identifier: "release" + - job: tests identifier: cockpit-revdeps trigger: pull_request diff --git a/gating.yaml b/gating.yaml index 5ab3627..1fb3172 100644 --- a/gating.yaml +++ b/gating.yaml @@ -7,3 +7,10 @@ decision_contexts: subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + +--- !Policy +product_versions: + - rhel-* +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/plans/cockpit-podman.fmf b/plans/cockpit-podman.fmf new file mode 100644 index 0000000..9485470 --- /dev/null +++ b/plans/cockpit-podman.fmf @@ -0,0 +1,37 @@ +# reverse dependency test for https://github.com/cockpit-project/cockpit-podman/ +# packit should automatically notify the cockpit maintainers on failures. +# For questions, please contact @martinpitt, @jelly, @mvollmer +enabled: false + +adjust+: + when: revdeps == yes + enabled: true + +discover: + how: fmf + url: https://github.com/cockpit-project/cockpit-podman + ref: "main" + +execute: + how: tmt + +# not relevant for testing podman +environment: + TEST_AUDIT_NO_SELINUX: 1 + TEST_ALLOW_JOURNAL_MESSAGES: ".*" + +# This has to duplicate cockpit-podman's plan structure; see https://github.com/teemtee/tmt/issues/1770 +/podman-system: + summary: Run cockpit-podman system tests + discover+: + test: /test/browser/system + +/podman-user: + summary: Run cockpit-podman user tests + discover+: + test: /test/browser/user + +/podman-misc: + summary: Run other cockpit-podman tests + discover+: + test: /test/browser/other diff --git a/plans/system.fmf b/plans/system.fmf new file mode 100644 index 0000000..6a2c5ba --- /dev/null +++ b/plans/system.fmf @@ -0,0 +1,56 @@ +discover: + how: fmf + +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 + 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 + when: revdeps == yes + +provision: + how: artemis + hardware: + memory: ">= 16 GB" + cpu: + cores: ">= 4" + threads: ">=8" + disk: + - size: ">= 512 GB" + +/local-root: + summary: Local rootful tests + discover+: + filter: 'tag:local & tag:root' + +/local-rootless: + summary: Local rootless tests + discover+: + filter: 'tag:local & tag:rootless' + +/remote-root: + summary: Remote rootful tests + discover+: + filter: 'tag:remote & tag:root' + +/remote-rootless: + summary: Remote rootless tests + discover+: + filter: 'tag:remote & tag:rootless' diff --git a/plans/tmt.fmf b/plans/tmt.fmf new file mode 100644 index 0000000..fa96694 --- /dev/null +++ b/plans/tmt.fmf @@ -0,0 +1,29 @@ +summary: Run tmt container provision test (downstream only) + +discover: + how: fmf + filter: 'tag:tmt & tag:downstream' + +execute: + how: tmt + +provision: + how: artemis + hardware: + memory: ">= 16 GB" + cpu: + cores: ">= 4" + threads: ">=8" + disk: + - size: ">= 512 GB" +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 + order: 10 + +adjust+: + - enabled: false + when: revdeps == yes diff --git a/plans/toolbox.fmf b/plans/toolbox.fmf new file mode 100644 index 0000000..81504f6 --- /dev/null +++ b/plans/toolbox.fmf @@ -0,0 +1,13 @@ +summary: Run toolbox tests (downstream only) +prepare: + - name: packages + how: install + package: [toolbox-tests] + +discover: + how: fmf + url: https://src.fedoraproject.org/rpms/toolbox + ref: "rawhide" + +execute: + how: tmt diff --git a/test/tmt/system.fmf b/test/tmt/system.fmf new file mode 100644 index 0000000..3e5d52d --- /dev/null +++ b/test/tmt/system.fmf @@ -0,0 +1,48 @@ +require: + - attr + - bats + - podman-remote + - podman-tests + - psmisc + - slirp4netns + +environment: + PODMAN: /usr/bin/podman + PODMAN_TESTING: /usr/bin/podman-testing + QUADLET: /usr/libexec/podman/quadlet + ROOTLESS_USER: "fedora" +adjust+: + - when: distro == centos-stream + environment+: + ROOTLESS_USER: "ec2-user" + - when: distro == rhel + environment+: + ROOTLESS_USER: "cloud-user" + +/local-root: + tag: [ local, root ] + summary: local rootful test + test: bash ./system.sh + duration: 30m + +/local-rootless: + tag: [ local, rootless ] + summary: rootless test + test: bash ./system.sh rootless + duration: 30m + +/remote-root: + tag: [ remote, root ] + summary: remote rootful test + test: bash ./system.sh + duration: 30m + environment+: + PODMAN: /usr/bin/podman-remote + +/remote-rootless: + tag: [ remote, rootless ] + summary: remote rootless test + test: bash ./system.sh rootless + duration: 30m + environment+: + PODMAN: /usr/bin/podman-remote diff --git a/test/tmt/system.sh b/test/tmt/system.sh new file mode 100644 index 0000000..9ed099f --- /dev/null +++ b/test/tmt/system.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +set -exo pipefail + +uname -r + +loginctl enable-linger "$ROOTLESS_USER" + +rpm -q \ + aardvark-dns \ + buildah \ + conmon \ + container-selinux \ + containers-common \ + crun \ + netavark \ + passt \ + podman \ + podman-tests \ + skopeo \ + slirp4netns \ + systemd + +export system_service_cmd="/usr/bin/podman system service --timeout=0 &" +export test_cmd="whoami && cd /usr/share/podman/test/system && bats ." + +if [[ -z $1 ]]; then + if [[ $PODMAN == "/usr/bin/podman-remote" ]]; then + eval $system_service_cmd + fi + eval $test_cmd +elif [[ $1 == "rootless" ]]; then + if [[ $PODMAN == "/usr/bin/podman-remote" ]]; then + su - "$ROOTLESS_USER" -c "eval $system_service_cmd" + fi + su --whitelist-environment=$(cat ./tmt-envvars | tr '\n' ',') - "$ROOTLESS_USER" -c "eval $test_cmd" +fi + +# Kill all podman processes for remote tests +if [[ $PODMAN == "/usr/bin/podman-remote" ]]; then + killall -q podman +fi +exit 0 diff --git a/test/tmt/tmt-envvars b/test/tmt/tmt-envvars new file mode 100644 index 0000000..3ae53a1 --- /dev/null +++ b/test/tmt/tmt-envvars @@ -0,0 +1,20 @@ +TMT_TREE +TMT_PLAN_DATA +TMT_VERSION +TMT_TEST_NAME +TMT_TEST_DATA +TMT_TEST_SERIAL_NUMBER +TMT_TEST_ITERATION_ID +TMT_TEST_METADATA +TMT_SOURCE_DIR +TMT_REBOOT_COUNT +TMT_TEST_RESTART_COUNT +TMT_TOPOLOGY_BASH +TMT_TOPOLOGY_YAML +TMT_TEST_PIDFILE +TMT_TEST_PIDFILE_LOCK +TMT_TEST_PIDFILE_ROOT +PODMAN +PODMAN_TESTING +QUADLET +ROOTLESS_USER diff --git a/test/tmt/tmt.fmf b/test/tmt/tmt.fmf new file mode 100644 index 0000000..187fc1c --- /dev/null +++ b/test/tmt/tmt.fmf @@ -0,0 +1,14 @@ +enabled: false +adjust: + enabled: true + when: initiator != packit and distro != rhel-10 or distro != centos-stream-10 + +summary: Make sure that TMT container provision works +tag: [ tmt, downstream ] +require: + - tmt+provision-container +test: + tmt run --verbose --remove + provision --how container --image fedora + login --command 'cat /etc/os-release' + finish diff --git a/tests/README b/tests/README deleted file mode 100644 index 72aa202..0000000 --- a/tests/README +++ /dev/null @@ -1,18 +0,0 @@ -I'm sorry. The playbooks here are a much-too-complicated way of saying: - - - test podman (root and rootless) - - same, with podman-remote - -The starting point is tests.yml . From there: - - tests.yml - \- test_podman.yml - |- roles/rootless_user_ready/ - \- run_podman_tests.yml (once for local, once for remote) - \- roles/run_bats_tests/ (runs tests: root, rootless) - -Principal result is the file 'artifacts/test.log'. It will contain -one line for each test run, format will be '(PASS|FAIL|ERROR) ' - -For each completed test there will also be a 'test..bats.log' -containing some setup blurbs (RPMs, environment) and the full BATS log. diff --git a/tests/check_results.yml b/tests/check_results.yml deleted file mode 100644 index e1de3bd..0000000 --- a/tests/check_results.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -# Copied from standard-test-basic -# ...and, 2020-05-13, updated, looks like they changed the whole thing around -- name: Check the results - local_action: - module: shell - cmd: | - log="{{ artifacts }}/test.log" - if [ ! -f "$log" ]; then - echo ERROR - echo "Test results not found." 1>&2 - elif grep ^ERROR "$log" 1>&2; then - echo ERROR - elif grep ^FAIL "$log" 1>&2; then - echo FAIL - elif grep -q ^PASS "$log"; then - echo PASS - else - echo ERROR - echo "No test results found." 1>&2 - fi - register: test_results - -- name: Set role result - set_fact: - role_result: "{{ test_results.stdout }}" - role_message: "{{ test_results.stderr|d('test execution error.') }}" - -- name: display results - vars: - msg: | - role_result: {{ role_result|d('Undefined') }} - {{ role_message|d('[No error messages found]') }} - debug: - msg: "{{ msg.split('\n') }}" - failed_when: role_message|d("") != "" diff --git a/tests/roles/disable_systemd_resolved/files/disable_systemd_resolved.sh b/tests/roles/disable_systemd_resolved/files/disable_systemd_resolved.sh deleted file mode 100755 index f5cb4da..0000000 --- a/tests/roles/disable_systemd_resolved/files/disable_systemd_resolved.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -# -# Excerpted from https://github.com/containers/automation_images/blob/main/systemd_banish.sh -# -# Early 2023: https://github.com/containers/podman/issues/16973 -# -# We see countless instances of "lookup cdn03.quay.io" flakes. -# Disabling the systemd resolver has completely resolved those, -# from multiple flakes per day to zero in a month. -# -# Opinions differ on the merits of systemd-resolve, but the fact is -# it breaks our CI testing. Kill it. -nsswitch=/etc/authselect/nsswitch.conf -if [[ -e $nsswitch ]]; then - if grep -q -E 'hosts:.*resolve' $nsswitch; then - echo "Disabling systemd-resolved" - sed -i -e 's/^\(hosts: *\).*/\1files dns myhostname/' $nsswitch - systemctl disable --now systemd-resolved - rm -f /etc/resolv.conf - - # NetworkManager may already be running, or it may not.... - systemctl start NetworkManager - sleep 1 - systemctl restart NetworkManager - - # ...and it may create resolv.conf upon start/restart, or it - # may not. Keep restarting until it does. (Yes, I realize - # this is cargocult thinking. Don't care. Not worth the effort - # to diagnose and solve properly.) - retries=10 - while ! test -e /etc/resolv.conf;do - retries=$((retries - 1)) - if [[ $retries -eq 0 ]]; then - echo "Timed out waiting for resolv.conf" >&2 - echo "...gonna try continuing. Expect failures." >&2 - fi - systemctl restart NetworkManager - sleep 5 - done - fi -fi diff --git a/tests/roles/disable_systemd_resolved/tasks/main.yml b/tests/roles/disable_systemd_resolved/tasks/main.yml deleted file mode 100644 index 7c77540..0000000 --- a/tests/roles/disable_systemd_resolved/tasks/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: disable systemd resolved - script: ./disable_systemd_resolved.sh diff --git a/tests/roles/rootless_user_ready/tasks/main.yml b/tests/roles/rootless_user_ready/tasks/main.yml deleted file mode 100644 index 88ad032..0000000 --- a/tests/roles/rootless_user_ready/tasks/main.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- name: make sure rootless account exists - user: name={{ rootless_user }} - -- name: rootless account | enable linger - shell: loginctl enable-linger {{ rootless_user }} - -- name: rootless account | get uid - getent: - database: passwd - key: "{{ rootless_user }}" - -- name: rootless account | preserve uid - set_fact: rootless_uid="{{ getent_passwd[rootless_user][1] }}" diff --git a/tests/roles/run_bats_tests/files/run_bats_tests.sh b/tests/roles/run_bats_tests/files/run_bats_tests.sh deleted file mode 100755 index e82a903..0000000 --- a/tests/roles/run_bats_tests/files/run_bats_tests.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash -# -# Run bats tests for a given $TEST_PACKAGE, e.g. buildah, podman -# -# This is invoked by the 'run_bats_tests' role; we assume that -# the package foo has a foo-tests subpackage which provides the -# directory /usr/share/foo/test/system, containing one or more .bats -# test files. -# -# We create two files: -# -# /tmp/test.summary.log - one-liner with FAIL, PASS, ERROR and a blurb -# /tmp/test.bats.log - full log of this script, plus the BATS run -# -export PATH=/usr/local/bin:/usr/sbin:/usr/bin - -FULL_LOG=/tmp/test.bats.log -rm -f $FULL_LOG -touch $FULL_LOG - -# Preserve output to a log file, but also emit on stdout. This covers -# RHEL (which preserves logfiles but runs ansible without --verbose) -# and Fedora (which hides logfiles but runs ansible --verbose). -exec &> >(tee -a $FULL_LOG) - -# Log program versions -echo "Packages:" -echo " Kernel: $(uname -r)" -rpm -qa |\ - grep -E 'buildah|skopeo|toolbox|podman|conmon|containers-common|crun|runc|iptable|slirp|aardvark|netavark|containernetworking-plugins|systemd|container-selinux|passt' |\ - sort |\ - sed -e 's/^/ /' - -divider='------------------------------------------------------------------' -echo $divider -printenv | sort -echo $divider -echo "ip addr:" -ip addr -echo $divider - -testdir=/usr/share/${TEST_PACKAGE}/test/system - -if ! cd $testdir; then - echo "FAIL ${TEST_NAME} : cd $testdir" > /tmp/test.summary.log - exit 0 -fi - -if [[ $PODMAN =~ remote ]]; then - ${PODMAN%%-remote} system service -t0 &>/dev/null & - PODMAN_SERVER_PID=$! -fi - -echo "\$ bats ." -bats . -rc=$? - -if [[ -n "$PODMAN_SERVER_PID" ]]; then - kill $PODMAN_SERVER_PID -fi - -echo $divider -echo "bats completed with status $rc" - -status=PASS -if [ $rc -ne 0 ]; then - status=FAIL -fi - -echo "${status} ${TEST_NAME}" > /tmp/test.summary.log - -# FIXME: for CI purposes, always exit 0. This allows subsequent tests. -exit 0 diff --git a/tests/roles/run_bats_tests/tasks/main.yml b/tests/roles/run_bats_tests/tasks/main.yml deleted file mode 100644 index decf8ef..0000000 --- a/tests/roles/run_bats_tests/tasks/main.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# Create empty results file, world-writable -- name: initialize test.log file - copy: dest=/tmp/test.log content='' force=yes mode=0666 - -- name: execute tests - include_tasks: run_one_test.yml - with_items: "{{ tests }}" - loop_control: - loop_var: test diff --git a/tests/roles/run_bats_tests/tasks/run_one_test.yml b/tests/roles/run_bats_tests/tasks/run_one_test.yml deleted file mode 100644 index 9ef8cb7..0000000 --- a/tests/roles/run_bats_tests/tasks/run_one_test.yml +++ /dev/null @@ -1,87 +0,0 @@ ---- -- name: "{{ test.name }} | install test packages" - dnf: name="{{ test.package }}-tests" state=installed - -- name: "{{ test.name }} | define helper variables" - set_fact: - test_name_oneword: "{{ test.name | replace(' ','-') }}" - -# UGH. This is necessary because our caller sets some environment variables -# and we need to set a few more based on other caller variables; then we -# need to combine the two dicts when running the test. This seems to be -# the only way to do it in ansible. -- name: "{{ test.name }} | define local environment" - set_fact: - local_environment: - TEST_NAME: "{{ test.name }}" - TEST_PACKAGE: "{{ test.package }}" - TEST_ENV: "{{ test.environment }}" - -- name: "{{ test.name }} | setup/teardown helper | see if exists" - local_action: stat path={{ role_path }}/files/helper.{{ test_name_oneword }}.sh - register: helper - -- name: "{{ test.name }} | setup/teardown helper | install" - copy: src=helper.{{ test_name_oneword }}.sh dest=/tmp/helper.sh - when: helper.stat.exists - -# This is what runs the BATS tests. -- name: "{{ test.name }} | run test" - script: ./run_bats_tests.sh - args: - chdir: /usr/share/{{ test.package }}/test/system - become: "{{ true if test.become is defined else false }}" - become_user: "{{ rootless_user }}" - environment: "{{ local_environment | combine(test.environment) }}" - -# BATS tests will always exit zero and should leave behind two files: -# a full log (test.bats.log) and a one-line PASS/FAIL file (.summary.log) -- name: "{{ test.name }} | pull logs" - fetch: - src: "/tmp/test.{{ item }}.log" - dest: "{{ artifacts }}/test.{{ test_name_oneword }}.{{ item }}.log" - flat: yes - with_items: - - bats - - summary - -# Collect all the one-line PASS/FAIL results in one file, test.log -# Write the same thing, in a different format, to results.yml -# https://docs.fedoraproject.org/en-US/ci/standard-test-interface/ -- name: "{{ test.name }} | keep running tally of test results" - local_action: - module: shell - cmd: | - cd {{ artifacts }} - cat "test.{{ test_name_oneword }}.summary.log" >>test.log - - status=$(awk '{print $1}' >results.yml - echo " result: $status" >>results.yml - echo " logs: test.{{ test_name_oneword }}.bats.log" >>results.yml - - # delete the oneliner file, to keep artifacts dir clean - rm -f test.{{ test_name_oneword }}.summary.log - -- name: "{{ test.name }} | remove remote logs and helpers" - file: - dest=/tmp/{{ item }} - state=absent - with_items: - - test.bats.log - - test.summary.log - - helper.sh - -# AAAAARGH! -# -# Fedora gating tests are failing, because str-common-final/tasks/main.yml -# tries to pull test.log and other logs from $remote_host:/tmp/artifacts . -# Those don't exist, because I track status and artifacts locally, because -# with the reboot I can't rely on /tmp being preserved. -# I see no way to tell str-common-final to skip this step; so let's just -# push logs over upon completion of each subtest. -- name: keep remote artifacts synced - synchronize: - src: "{{ artifacts }}/" - dest: "{{ remote_artifacts|d('/tmp/artifacts') }}/" - mode: push diff --git a/tests/run_podman_tests.yml b/tests/run_podman_tests.yml deleted file mode 100644 index 06b2525..0000000 --- a/tests/run_podman_tests.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- name: "podman-remote | install" - dnf: name="podman-remote" state=installed - when: podman_bin == "podman-remote" - -# As of podman 5.0, slirp is a soft dependency. Until/unless it is -# actually deprecated, we continue to test with it. -- name: "slirp4netns | install" - dnf: name="slirp4netns" state=installed - -- include_role: - name: run_bats_tests - vars: - tests: - # Yes, this is horrible duplication, but trying to refactor in ansible - # yields even more horrible unreadable code. This is the lesser evil. - - name: "{{ podman_bin }} root" - package: podman - environment: - PODMAN: /usr/bin/{{ podman_bin }} - PODMAN_TESTING: /usr/bin/podman-testing - QUADLET: /usr/libexec/podman/quadlet - - name: "{{ podman_bin }} rootless" - package: podman - environment: - PODMAN: /usr/bin/{{ podman_bin }} - PODMAN_TESTING: /usr/bin/podman-testing - QUADLET: /usr/libexec/podman/quadlet - become: true diff --git a/tests/test_podman.yml b/tests/test_podman.yml deleted file mode 100644 index d471630..0000000 --- a/tests/test_podman.yml +++ /dev/null @@ -1,39 +0,0 @@ ---- -- hosts: localhost - tags: - - classic - - container - vars: - - artifacts: ./artifacts - rootless_user: testuser - roles: - - role: disable_systemd_resolved - - role: rootless_user_ready - - tasks: - # At the start of a run, clean up state. Useful for test reruns. - - name: local artifacts directory exists - local_action: file path="{{ artifacts }}" state=directory - - - name: remove stale log files - local_action: shell rm -f {{ artifacts }}/test*.log - - - name: clear test results (test.log) - local_action: command truncate --size=0 {{ artifacts }}/test.log - - - name: clear test results (results.yml) - local_action: copy content="results:\n" dest={{ artifacts }}/results.yml - - # These are the actual tests. - - name: test podman - include_tasks: run_podman_tests.yml - loop: [ podman, podman-remote ] - loop_control: - loop_var: podman_bin - - - name: test toolbx - include_tasks: test_toolbx.yml - - # Postprocessing: check for FAIL or ERROR in any test, exit 1 if so - - name: check results - include_tasks: check_results.yml diff --git a/tests/test_toolbx.yml b/tests/test_toolbx.yml deleted file mode 100644 index 58494f4..0000000 --- a/tests/test_toolbx.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- include_role: - name: run_bats_tests - vars: - tests: - - name: toolbx - package: toolbox - become: true - environment: - TMPDIR: /var/tmp - XDG_RUNTIME_DIR: /run/user/{{ rootless_uid }} diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 80caee7..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1 +0,0 @@ -- import_playbook: test_podman.yml From 30326849d82ef9f2cb2360f5b048b00f0dd9594d Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 5 Feb 2025 19:03:28 +0000 Subject: [PATCH 21/45] Update to 5.4.0-rc3 upstream release Upstream tag: v5.4.0-rc3 Upstream commit: ad54787b Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 74 ++------------------------------------------------- README.packit | 2 +- podman.spec | 20 ++++++++++++-- sources | 2 +- 5 files changed, 23 insertions(+), 76 deletions(-) diff --git a/.gitignore b/.gitignore index e394912..9b90513 100644 --- a/.gitignore +++ b/.gitignore @@ -1876,3 +1876,4 @@ /v5.3.1.tar.gz /v5.3.2.tar.gz /v5.4.0-rc2.tar.gz +/v5.4.0-rc3.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 09334de..637e020 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -5,27 +5,6 @@ downstream_package_name: podman 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 - mkpath: true - - src: test/tmt/ - dest: test/tmt/ - delete: true - mkpath: true - - src: .fmf/ - dest: .fmf/ - delete: true - - .packit.yaml - packages: podman-fedora: pkg_tool: fedpkg @@ -52,7 +31,7 @@ jobs: failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." enable_net: true - targets: &fedora_copr_targets + targets: - fedora-all-x86_64 - fedora-all-aarch64 @@ -74,7 +53,7 @@ jobs: packages: [podman-centos] notifications: *packit_build_failure_notification enable_net: true - targets: ¢os_copr_targets + targets: - centos-stream-9-x86_64 - centos-stream-9-aarch64 - centos-stream-10-x86_64 @@ -92,55 +71,6 @@ jobs: project: podman-next enable_net: true - - job: tests - trigger: pull_request - packages: [podman-fedora] - targets: *fedora_copr_targets - require: &dev_tests - label: - absent: - - release - 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 - identifier: "dev" - - - job: tests - trigger: pull_request - packages: [podman-fedora] - targets: *fedora_copr_targets - require: &release_tests - label: - present: - - release - preserve_project: true - identifier: "release" - - # FIXME: Enable centos stream tests after containers-common is fixed - # FIXME: centos stream 10 currently also lacks bats - # https://bugzilla.redhat.com/show_bug.cgi?id=2329315 - - job: tests - trigger: ignore - packages: [podman-centos] - targets: *centos_copr_targets - require: *dev_tests - 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 - identifier: "dev" - - - job: tests - trigger: ignore - packages: [podman-centos] - targets: *centos_copr_targets - require: *release_tests - preserve_project: true - identifier: "release" - - job: tests identifier: cockpit-revdeps trigger: pull_request diff --git a/README.packit b/README.packit index 5732d6a..c1b4159 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.0.1. +The file was generated using packit 1.1.0. diff --git a/podman.spec b/podman.spec index d8c58d1..223f2fb 100644 --- a/podman.spec +++ b/podman.spec @@ -24,6 +24,8 @@ %if %{defined fedora} %define build_with_btrfs 1 +# qemu-system* isn't packageed for CentOS Stream / RHEL +%define qemu 1 %endif %if %{defined copr_username} @@ -55,7 +57,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.4.0~rc2 +Version: 5.4.0~rc3 # 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 @@ -142,6 +144,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} %if %{defined fedora} Requires: bats %endif +Requires: attr Requires: jq Requires: skopeo Requires: nmap-ncat @@ -187,7 +190,17 @@ when `%{_bindir}/%{name}sh` is set as a login shell or set as os.Args[0]. Summary: Metapackage for setting up %{name} machine Requires: %{name} = %{epoch}:%{version}-%{release} Requires: gvisor-tap-vsock -Requires: qemu +%if %{defined qemu} +%ifarch aarch64 +Requires: qemu-system-aarch64-core +%endif +%ifarch x86_64 +Requires: qemu-system-x86-core +%endif +%else +Requires: qemu-kvm +%endif +Requires: qemu-img Requires: virtiofsd ExclusiveArch: x86_64 aarch64 @@ -296,6 +309,9 @@ ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name} #define license tag if not already defined %{!?_licensedir:%global license %doc} +# Include empty check to silence rpmlint warning +%check + %files -f %{name}.file-list %license LICENSE vendor/modules.txt %doc README.md CONTRIBUTING.md install.md transfer.md diff --git a/sources b/sources index 88bca5d..6c05703 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.4.0-rc2.tar.gz) = 74c6e59489e4fc473f23c4642e72bd60c434a4160b871b47032d95b8a06e73ad7d1032299f8a421a42084b3fd7d090afbfd2688781dc4753986bbeb3a686e523 +SHA512 (v5.4.0-rc3.tar.gz) = f018ddead98b628dc4b11688e4c5a5a9087d068d7440687e44eb0dc0577a88ed0910f7a640a746bd1ddcb62dbe774495e433d43dfc97de93d3d5a2fc5d1f62cb From 1b7f37d3d5c5677aed5b10c1fc3cc4f0ed92fd21 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 11 Feb 2025 18:27:23 +0000 Subject: [PATCH 22/45] Update to 5.4.0 upstream release Upstream tag: v5.4.0 Upstream commit: f9f7d48b Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 35 +++++++++++++++++++++-------------- sources | 2 +- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 9b90513..f05afda 100644 --- a/.gitignore +++ b/.gitignore @@ -1877,3 +1877,4 @@ /v5.3.2.tar.gz /v5.4.0-rc2.tar.gz /v5.4.0-rc3.tar.gz +/v5.4.0.tar.gz diff --git a/README.packit b/README.packit index c1b4159..7017e6c 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.1.0. +The file was generated using packit 1.1.0.post1.dev2+gf7b527d0. diff --git a/podman.spec b/podman.spec index 223f2fb..d8dff52 100644 --- a/podman.spec +++ b/podman.spec @@ -7,21 +7,8 @@ %global debug_package %{nil} %endif -# RHEL's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we -# set it separately here and do not depend on RHEL's go-[s]rpm-macros package -# until that's fixed. -# c9s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227328 -%if %{defined rhel} && 0%{?rhel} < 10 -%define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "-linkmode=external -compressdwarf=false ${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**}; -%endif - %global gomodulesmode GO111MODULE=on -%if %{defined rhel} -# _user_tmpfiles.d currently undefined on rhel -%global _user_tmpfilesdir %{_datadir}/user-tmpfiles.d -%endif - %if %{defined fedora} %define build_with_btrfs 1 # qemu-system* isn't packageed for CentOS Stream / RHEL @@ -32,6 +19,11 @@ %define copr_build 1 %endif +# Only RHEL and CentOS Stream rpms are built with fips-enabled go compiler +%if %{defined rhel} +%define fips_enabled 1 +%endif + %global container_base_path github.com/containers %global container_base_url https://%{container_base_path} @@ -45,6 +37,12 @@ # podman-machine subpackage will be present only on these architectures %global machine_arches x86_64 aarch64 +%if %{defined copr_build} +%define build_origin Copr: %{?copr_username}/%{?copr_projectname} +%else +%define build_origin %{?packager} +%endif + Name: podman %if %{defined copr_build} Epoch: 102 @@ -57,7 +55,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.4.0~rc3 +Version: 5.4.0 # 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 @@ -242,6 +240,7 @@ export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full" export GOPROXY=direct LDFLAGS="-X %{ld_libpod}/define.buildInfo=${SOURCE_DATE_EPOCH:-$(date +%s)} \ + -X \"%{ld_libpod}/define.buildOrigin=%{build_origin}\" \ -X %{ld_libpod}/config._installPrefix=%{_prefix} \ -X %{ld_libpod}/config._etcDir=%{_sysconfdir} \ -X %{ld_project}/pkg/systemd/quadlet._binDir=%{_bindir}" @@ -251,6 +250,14 @@ LDFLAGS="-X %{ld_libpod}/define.buildInfo=${SOURCE_DATE_EPOCH:-$(date +%s)} \ export BASEBUILDTAGS="seccomp exclude_graphdriver_devicemapper $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)" +# libtrust_openssl buildtag switches to using the FIPS-compatible func +# `ecdsa.HashSign`. +# Ref 1: https://github.com/golang-fips/go/blob/main/patches/015-add-hash-sign-verify.patch#L22 +# Ref 2: https://github.com/containers/libtrust/blob/main/ec_key_openssl.go#L23 +%if %{defined fips_enabled} +export BASEBUILDTAGS="$BASEBUILDTAGS libtrust_openssl" +%endif + # build %%{name} export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh)" %gobuild -o bin/%{name} ./cmd/%{name} diff --git a/sources b/sources index 6c05703..01e7baf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.4.0-rc3.tar.gz) = f018ddead98b628dc4b11688e4c5a5a9087d068d7440687e44eb0dc0577a88ed0910f7a640a746bd1ddcb62dbe774495e433d43dfc97de93d3d5a2fc5d1f62cb +SHA512 (v5.4.0.tar.gz) = f120178be0230ddc5d6b2b41d3c121fdecf5b8ef26bac74e0654e8be295e862ccb790e5a7178bfe65f93e2e106e92af3953d4b97c7383ec0b2fbfa250d72a8a1 From 357520e360afe3e5ccd8d571e56ef9db8d463a1e Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 11 Mar 2025 18:38:49 +0000 Subject: [PATCH 23/45] Update to 5.4.1 upstream release Upstream tag: v5.4.1 Upstream commit: b79bc8af Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 12 ++++++------ README.packit | 2 +- podman.spec | 16 +++++++--------- sources | 2 +- 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index f05afda..d7759a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1878,3 +1878,4 @@ /v5.4.0-rc2.tar.gz /v5.4.0-rc3.tar.gz /v5.4.0.tar.gz +/v5.4.1.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 637e020..7c088fc 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -20,16 +20,16 @@ srpm_build_deps: - make actions: - fix-spec-file: - - "bash .packit.sh" + fix-spec-file: "bash .packit-copr-rpm.sh" + pre-sync: "bash .packit-rpm-git-commit.sh" jobs: - job: copr_build trigger: pull_request packages: [podman-fedora] - notifications: &packit_build_failure_notification + notifications: &packit_generic_failure_notification failure_comment: - message: "Ephemeral COPR build failed. @containers/packit-build please check." + message: "[NON-BLOCKING] Packit jobs failed. @containers/packit-build please check. Everyone else, feel free to ignore." enable_net: true targets: - fedora-all-x86_64 @@ -38,7 +38,7 @@ jobs: - job: copr_build trigger: pull_request packages: [podman-eln] - notifications: *packit_build_failure_notification + notifications: *packit_generic_failure_notification enable_net: true targets: fedora-eln-x86_64: @@ -51,7 +51,7 @@ jobs: - job: copr_build trigger: pull_request packages: [podman-centos] - notifications: *packit_build_failure_notification + notifications: *packit_generic_failure_notification enable_net: true targets: - centos-stream-9-x86_64 diff --git a/README.packit b/README.packit index 7017e6c..f5cc99f 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.1.0.post1.dev2+gf7b527d0. +The file was generated using packit 1.2.0.post1.dev13+g55ed4527. diff --git a/podman.spec b/podman.spec index d8dff52..bf8ab1b 100644 --- a/podman.spec +++ b/podman.spec @@ -55,7 +55,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.4.0 +Version: 5.4.1 # 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 @@ -151,6 +151,7 @@ Requires: openssl Requires: socat Requires: buildah Requires: gnupg +Requires: xfsprogs %description tests %{summary} @@ -216,14 +217,6 @@ sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile sed -i '/DELETE ON RHEL9/,/DELETE ON RHEL9/d' libpod/runtime.go %endif -# These changes are only meant for copr builds -%if %{defined copr_build} -# podman --version should show short sha -sed -i "s/^const RawVersion = .*/const RawVersion = \"##VERSION##-##SHORT_SHA##\"/" version/rawversion/version.go -# use ParseTolerant to allow short sha in version -sed -i "s/^var Version.*/var Version, err = semver.ParseTolerant(rawversion.RawVersion)/" version/version.go -%endif - %build %set_build_flags export CGO_CFLAGS=$CFLAGS @@ -245,6 +238,11 @@ LDFLAGS="-X %{ld_libpod}/define.buildInfo=${SOURCE_DATE_EPOCH:-$(date +%s)} \ -X %{ld_libpod}/config._etcDir=%{_sysconfdir} \ -X %{ld_project}/pkg/systemd/quadlet._binDir=%{_bindir}" +# 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="b79bc8afe796cba51dd906270a7e1056ccdfcf9e""" +LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT" + # build rootlessport first %gobuild -o bin/rootlessport ./cmd/rootlessport diff --git a/sources b/sources index 01e7baf..0539f17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.4.0.tar.gz) = f120178be0230ddc5d6b2b41d3c121fdecf5b8ef26bac74e0654e8be295e862ccb790e5a7178bfe65f93e2e106e92af3953d4b97c7383ec0b2fbfa250d72a8a1 +SHA512 (v5.4.1.tar.gz) = 7cbe02c4fdfce83e8becd5c167768d25eab621794e736e7741ca8d4d1384e7db550c59b2f45356aaabd49d9d236bae65bad7f60dc2392a0903ceec812fa5d1c2 From 1127f92dc8507ca1efad44afcf8cdf686e39510b Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 2 Apr 2025 16:30:28 +0000 Subject: [PATCH 24/45] Update to 5.4.2 upstream release Upstream tag: v5.4.2 Upstream commit: be85287f Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 6 +++--- sources | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d7759a9..b278a6a 100644 --- a/.gitignore +++ b/.gitignore @@ -1879,3 +1879,4 @@ /v5.4.0-rc3.tar.gz /v5.4.0.tar.gz /v5.4.1.tar.gz +/v5.4.2.tar.gz diff --git a/README.packit b/README.packit index f5cc99f..bb4a369 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.2.0.post1.dev13+g55ed4527. +The file was generated using packit 1.4.0.post1.dev4+g043c5fde. diff --git a/podman.spec b/podman.spec index bf8ab1b..4b8218c 100644 --- a/podman.spec +++ b/podman.spec @@ -55,14 +55,14 @@ 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.4.1 +Version: 5.4.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 %if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} %else -ExclusiveArch: aarch64 ppc64le s390x x86_64 +ExclusiveArch: aarch64 ppc64le s390x x86_64 riscv64 %endif Summary: Manage Pods, Containers and Container Images URL: https://%{name}.io/ @@ -240,7 +240,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="b79bc8afe796cba51dd906270a7e1056ccdfcf9e""" +GIT_COMMIT="be85287fcf4590961614ee37be65eeb315e5d9ff" LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT" # build rootlessport first diff --git a/sources b/sources index 0539f17..f9d6862 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.4.1.tar.gz) = 7cbe02c4fdfce83e8becd5c167768d25eab621794e736e7741ca8d4d1384e7db550c59b2f45356aaabd49d9d236bae65bad7f60dc2392a0903ceec812fa5d1c2 +SHA512 (v5.4.2.tar.gz) = 482fde529766ca1b509a08bab4beb59a5935ebc6b27bc886c33597183258631e8c8db03ebb521baefd7989305aa76fad14c1359e211a0fe75c855c14bbaca960 From 0a4fcce7a88e38ee4f37b4f9c34e49bf21d26b76 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 24 Apr 2025 17:01:03 +0000 Subject: [PATCH 25/45] Update to 5.5.0-rc1 upstream release Upstream tag: v5.5.0-rc1 Upstream commit: 6a597e0e Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 17 +++++++++++++---- README.packit | 2 +- podman.spec | 7 ++++--- sources | 2 +- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index b278a6a..7054f85 100644 --- a/.gitignore +++ b/.gitignore @@ -1880,3 +1880,4 @@ /v5.4.0.tar.gz /v5.4.1.tar.gz /v5.4.2.tar.gz +/v5.5.0-rc1.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 7c088fc..b4170f5 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -15,6 +15,9 @@ packages: podman-eln: specfile_path: rpm/podman.spec +# Disable automatic merging for Copr builds (and subsequent Testing Farm) +merge_pr_in_ci: false + srpm_build_deps: - git-archive-all - make @@ -32,11 +35,16 @@ jobs: message: "[NON-BLOCKING] Packit jobs failed. @containers/packit-build please check. Everyone else, feel free to ignore." enable_net: true targets: - - fedora-all-x86_64 - - fedora-all-aarch64 + - fedora-latest-stable-x86_64 + - fedora-latest-stable-aarch64 + - fedora-development-x86_64 + - fedora-development-aarch64 + - fedora-41-x86_64 + - fedora-41-aarch64 + # Ignore until golang is updated in distro buildroot to go 1.23.3+ - job: copr_build - trigger: pull_request + trigger: ignore packages: [podman-eln] notifications: *packit_generic_failure_notification enable_net: true @@ -48,8 +56,9 @@ jobs: additional_repos: - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/aarch64/" + # Ignore until golang is updated in distro buildroot to go 1.23.3+ - job: copr_build - trigger: pull_request + trigger: ignore packages: [podman-centos] notifications: *packit_generic_failure_notification enable_net: true diff --git a/README.packit b/README.packit index bb4a369..807ffc6 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.4.0.post1.dev4+g043c5fde. +The file was generated using packit 1.6.0.post1.dev2+gd5a7662a. diff --git a/podman.spec b/podman.spec index 4b8218c..8bd4d91 100644 --- a/podman.spec +++ b/podman.spec @@ -55,7 +55,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.4.2 +Version: 5.5.0~rc1 # 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 @@ -149,6 +149,7 @@ Requires: nmap-ncat Requires: httpd-tools Requires: openssl Requires: socat +Requires: slirp4netns Requires: buildah Requires: gnupg Requires: xfsprogs @@ -240,13 +241,13 @@ 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="be85287fcf4590961614ee37be65eeb315e5d9ff" +GIT_COMMIT="6a597e0e89b0c597b9a5d8ac6b0f7ce66fb1fa14" LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT" # build rootlessport first %gobuild -o bin/rootlessport ./cmd/rootlessport -export BASEBUILDTAGS="seccomp exclude_graphdriver_devicemapper $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)" +export BASEBUILDTAGS="seccomp $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)" # libtrust_openssl buildtag switches to using the FIPS-compatible func # `ecdsa.HashSign`. diff --git a/sources b/sources index f9d6862..37ab5c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.4.2.tar.gz) = 482fde529766ca1b509a08bab4beb59a5935ebc6b27bc886c33597183258631e8c8db03ebb521baefd7989305aa76fad14c1359e211a0fe75c855c14bbaca960 +SHA512 (v5.5.0-rc1.tar.gz) = 03e85be811886e316debf39280fc543e551db05551b1aae90451b38838215fc90e1f3a60030e5a8ea4ccd89db3f7c8e88dbc87a7240b472aa0def070144d671b From 96a0e2f43962bb19b650ed6c10c882c7bd9fbf91 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 1 May 2025 12:40:01 +0000 Subject: [PATCH 26/45] Update to 5.5.0-rc2 upstream release Upstream tag: v5.5.0-rc2 Upstream commit: 3c4cf521 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + podman.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7054f85..85dc3dc 100644 --- a/.gitignore +++ b/.gitignore @@ -1881,3 +1881,4 @@ /v5.4.1.tar.gz /v5.4.2.tar.gz /v5.5.0-rc1.tar.gz +/v5.5.0-rc2.tar.gz diff --git a/podman.spec b/podman.spec index 8bd4d91..36387cb 100644 --- a/podman.spec +++ b/podman.spec @@ -55,7 +55,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.5.0~rc1 +Version: 5.5.0~rc2 # 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 @@ -241,7 +241,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="6a597e0e89b0c597b9a5d8ac6b0f7ce66fb1fa14" +GIT_COMMIT="3c4cf521428ce11906976ddd08a5a6e8626cd50e" LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT" # build rootlessport first diff --git a/sources b/sources index 37ab5c6..78f8b00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.5.0-rc1.tar.gz) = 03e85be811886e316debf39280fc543e551db05551b1aae90451b38838215fc90e1f3a60030e5a8ea4ccd89db3f7c8e88dbc87a7240b472aa0def070144d671b +SHA512 (v5.5.0-rc2.tar.gz) = 6c64f95dff39d3dbab9b450931dcd09dd4ff06915aa5032b60d94320751f41ee94f9da0b17cab4b76092db378de6faead5d3ad66ae119f06ae1688865191c98c From c65ae6022531a5430e8e6d78f29193c3c83cb853 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 7 Feb 2025 17:16:50 +0530 Subject: [PATCH 27/45] TMT: fix hardware provisioning for toolbox test Only enable toolbox tests on fedora bodhi updates. Signed-off-by: Lokesh Mandvekar --- plans/toolbox.fmf | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/plans/toolbox.fmf b/plans/toolbox.fmf index 81504f6..eb6ffda 100644 --- a/plans/toolbox.fmf +++ b/plans/toolbox.fmf @@ -1,4 +1,5 @@ summary: Run toolbox tests (downstream only) + prepare: - name: packages how: install @@ -11,3 +12,18 @@ discover: execute: how: tmt + +provision: + how: artemis + hardware: + memory: ">= 16 GB" + cpu: + cores: ">= 4" + threads: ">=8" + disk: + - size: ">= 512 GB" + +enabled: false +adjust: + - enabled: true + when: distro == fedora and initiator != packit From 16af8ff9677cb1bb3ae036f00e46513af0f1973c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 2 May 2025 16:23:47 +0530 Subject: [PATCH 28/45] cleanup: no plugins binaries built in rpm Signed-off-by: Lokesh Mandvekar --- podman.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/podman.spec b/podman.spec index 36387cb..903eac3 100644 --- a/podman.spec +++ b/podman.spec @@ -273,9 +273,6 @@ export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh)" %gobuild -o bin/podman-testing ./cmd/podman-testing -# reset LDFLAGS for plugins binaries -LDFLAGS='' - %{__make} docs docker-docs %install From cfd03ba6564b2ce4e80844d8ec124a2afda27018 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 2 May 2025 16:25:29 +0530 Subject: [PATCH 29/45] fix setup to test tmt itself do not enable on CentOS-Stream-10 and RHEL-10 as TMT is not yet present on EPEL10. Signed-off-by: Lokesh Mandvekar --- plans/tmt.fmf | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/plans/tmt.fmf b/plans/tmt.fmf index fa96694..4345cac 100644 --- a/plans/tmt.fmf +++ b/plans/tmt.fmf @@ -7,15 +7,6 @@ discover: execute: how: tmt -provision: - how: artemis - hardware: - memory: ">= 16 GB" - cpu: - cores: ">= 4" - threads: ">=8" - disk: - - size: ">= 512 GB" prepare: - when: distro == centos-stream or distro == rhel how: shell @@ -24,6 +15,8 @@ prepare: dnf -y config-manager --set-enabled epel order: 10 +enabled: true adjust+: - enabled: false - when: revdeps == yes + when: revdeps == yes or distro == centos-stream-10 or distro == rhel-10 + because: TMT is not yet available on EL10 environments From 9d09cecc7b3a65e45572123afee97064ee534bd2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 2 May 2025 16:37:18 +0530 Subject: [PATCH 30/45] TMT: system tests: Load null_blk kernel module to have /dev/nullb0 This also depends on patches in https://github.com/containers/podman/pull/26022 which will be present in final v5.5.0. Signed-off-by: Lokesh Mandvekar --- plans/system.fmf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plans/system.fmf b/plans/system.fmf index 6a2c5ba..e41ffb8 100644 --- a/plans/system.fmf +++ b/plans/system.fmf @@ -5,6 +5,9 @@ execute: how: tmt prepare: + - how: shell + script: modprobe null_blk nr_devices=1 + order: 5 - when: distro == centos-stream or distro == rhel how: shell script: | From 6988f89e7220cf6526d00b5d93d327200e99d650 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 14 May 2025 15:51:54 +0000 Subject: [PATCH 31/45] Update to 5.5.0 upstream release Upstream tag: v5.5.0 Upstream commit: 0dbcb514 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 85dc3dc..8016e9a 100644 --- a/.gitignore +++ b/.gitignore @@ -1882,3 +1882,4 @@ /v5.4.2.tar.gz /v5.5.0-rc1.tar.gz /v5.5.0-rc2.tar.gz +/v5.5.0.tar.gz diff --git a/podman.spec b/podman.spec index 903eac3..f1652f0 100644 --- a/podman.spec +++ b/podman.spec @@ -55,7 +55,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.5.0~rc2 +Version: 5.5.0 # 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 @@ -241,7 +241,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="3c4cf521428ce11906976ddd08a5a6e8626cd50e" +GIT_COMMIT="0dbcb51477ee7ab8d3b47d30facf71fc38bb0c98" LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT" # build rootlessport first @@ -273,6 +273,9 @@ export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh)" %gobuild -o bin/podman-testing ./cmd/podman-testing +# reset LDFLAGS for plugins binaries +LDFLAGS='' + %{__make} docs docker-docs %install diff --git a/sources b/sources index 78f8b00..8d3d639 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.5.0-rc2.tar.gz) = 6c64f95dff39d3dbab9b450931dcd09dd4ff06915aa5032b60d94320751f41ee94f9da0b17cab4b76092db378de6faead5d3ad66ae119f06ae1688865191c98c +SHA512 (v5.5.0.tar.gz) = 45dcfcad916d096bd0df83713a0d42257ba6071773f98551c65329a0fc441a4a106a3b6adc6479e9aebd4c36768d22dacaf3a060334ac7d4021c5c599c59a2ce From 3742f311a93e5fddac65fc654a4d4441e5022961 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 5 Jun 2025 21:57:23 +0000 Subject: [PATCH 32/45] Update to 5.5.1 upstream release Upstream tag: v5.5.1 Upstream commit: 850db76d Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 4 ++-- sources | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8016e9a..d830461 100644 --- a/.gitignore +++ b/.gitignore @@ -1883,3 +1883,4 @@ /v5.5.0-rc1.tar.gz /v5.5.0-rc2.tar.gz /v5.5.0.tar.gz +/v5.5.1.tar.gz diff --git a/README.packit b/README.packit index 807ffc6..6beb40f 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.6.0.post1.dev2+gd5a7662a. +The file was generated using packit 1.8.0.post1.dev31+g9980e597. diff --git a/podman.spec b/podman.spec index f1652f0..ef18e54 100644 --- a/podman.spec +++ b/podman.spec @@ -55,7 +55,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.5.0 +Version: 5.5.1 # 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 @@ -241,7 +241,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="0dbcb51477ee7ab8d3b47d30facf71fc38bb0c98" +GIT_COMMIT="850db76dd78a0641eddb9ee19ee6f60d2c59bcfa" LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT" # build rootlessport first diff --git a/sources b/sources index 8d3d639..c93a23b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.5.0.tar.gz) = 45dcfcad916d096bd0df83713a0d42257ba6071773f98551c65329a0fc441a4a106a3b6adc6479e9aebd4c36768d22dacaf3a060334ac7d4021c5c599c59a2ce +SHA512 (v5.5.1.tar.gz) = 275c18cd84ee1aacd870baf4b661e3bbaff81b075e86300dd462e5dfcb1d83a4b191bac8e622a5aad55eeaf3c46be6acb78db5937537c82e11f5b52b827fe921 From ff3eab78dc34f46c25bb2b4247c822b68d6e3956 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 24 Jun 2025 17:25:45 +0000 Subject: [PATCH 33/45] Update to 5.5.2 upstream release Upstream tag: v5.5.2 Upstream commit: e7d82267 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 9 ++++++--- sources | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d830461..6b19983 100644 --- a/.gitignore +++ b/.gitignore @@ -1884,3 +1884,4 @@ /v5.5.0-rc2.tar.gz /v5.5.0.tar.gz /v5.5.1.tar.gz +/v5.5.2.tar.gz diff --git a/README.packit b/README.packit index 6beb40f..dde2a46 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.8.0.post1.dev31+g9980e597. +The file was generated using packit 1.9.0.post1.dev4+g48b4c222. diff --git a/podman.spec b/podman.spec index ef18e54..085f09e 100644 --- a/podman.spec +++ b/podman.spec @@ -17,6 +17,9 @@ %if %{defined copr_username} %define copr_build 1 +%if "%{copr_username}" == "rhcontainerbot" && "%{copr_projectname}" == "podman-next" +%define next_build 1 +%endif %endif # Only RHEL and CentOS Stream rpms are built with fips-enabled go compiler @@ -44,7 +47,7 @@ %endif Name: podman -%if %{defined copr_build} +%if %{defined next_build} Epoch: 102 %else Epoch: 5 @@ -55,7 +58,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.5.1 +Version: 5.5.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 @@ -241,7 +244,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="850db76dd78a0641eddb9ee19ee6f60d2c59bcfa" +GIT_COMMIT="e7d8226745ba07a64b7176a7f128e4ef53225a0e" LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT" # build rootlessport first diff --git a/sources b/sources index c93a23b..a54bd48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.5.1.tar.gz) = 275c18cd84ee1aacd870baf4b661e3bbaff81b075e86300dd462e5dfcb1d83a4b191bac8e622a5aad55eeaf3c46be6acb78db5937537c82e11f5b52b827fe921 +SHA512 (v5.5.2.tar.gz) = c647e74c22053b95d09f81d9c594203492283bdb881245941fa2d7253946cbb4953d705313a0e57a0d6737cc07697381e8ba5ed388a74d440b74b5fe045821ec From 14d6a7ae7b13369012f2cb5a524409b4369f1668 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:59:27 +0000 Subject: [PATCH 34/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From b972298be7d228f47dbcc7413b982be7c6b25652 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 25 Jul 2025 19:03:28 +0000 Subject: [PATCH 35/45] Update to 5.6.0-rc1 upstream release Upstream tag: v5.6.0-rc1 Upstream commit: a3a6d9cc Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 53 +++++++++++++++++++++++++++++++++----------- gating.yaml | 1 + plans/tmt.fmf | 11 +++++---- plans/toolbox.fmf | 30 ++++++++++++------------- podman.spec | 28 +++++++++++------------ sources | 2 +- test/tmt/system.fmf | 15 ++++++++----- test/tmt/system.sh | 9 ++++---- test/tmt/tmt-envvars | 20 ----------------- test/tmt/tmt.fmf | 5 ++--- 11 files changed, 92 insertions(+), 83 deletions(-) delete mode 100644 test/tmt/tmt-envvars diff --git a/.gitignore b/.gitignore index 6b19983..f8517f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1885,3 +1885,4 @@ /v5.5.0.tar.gz /v5.5.1.tar.gz /v5.5.2.tar.gz +/v5.6.0-rc1.tar.gz diff --git a/.packit.yaml b/.packit.yaml index b4170f5..54f9d8e 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -5,6 +5,27 @@ downstream_package_name: podman 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 + mkpath: true + - src: test/tmt/ + dest: test/tmt/ + delete: true + mkpath: true + - src: .fmf/ + dest: .fmf/ + delete: true + - .packit.yaml + packages: podman-fedora: pkg_tool: fedpkg @@ -35,12 +56,11 @@ jobs: message: "[NON-BLOCKING] Packit jobs failed. @containers/packit-build please check. Everyone else, feel free to ignore." enable_net: true targets: - - fedora-latest-stable-x86_64 - - fedora-latest-stable-aarch64 - - fedora-development-x86_64 - - fedora-development-aarch64 - - fedora-41-x86_64 - - fedora-41-aarch64 + - fedora-all-x86_64 + - fedora-all-aarch64 + # Re-enable these scans if OpenScanHub starts scanning go packages + # https://packit.dev/posts/openscanhub-prototype + osh_diff_scan_after_copr_build: false # Ignore until golang is updated in distro buildroot to go 1.23.3+ - job: copr_build @@ -80,6 +100,20 @@ jobs: project: podman-next enable_net: true + # Tests on Fedora + - job: tests + trigger: pull_request + packages: [podman-fedora] + notifications: *packit_generic_failure_notification + 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 trigger: pull_request @@ -108,13 +142,6 @@ jobs: dist_git_branches: &fedora_targets - fedora-all - - job: propose_downstream - trigger: release - update_release: false - packages: [podman-centos] - dist_git_branches: - - c10s - - job: koji_build trigger: commit packages: [podman-fedora] diff --git a/gating.yaml b/gating.yaml index 1fb3172..92c7dc4 100644 --- a/gating.yaml +++ b/gating.yaml @@ -8,6 +8,7 @@ subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} +# recipients: jnovy, lsm5, santiago --- !Policy product_versions: - rhel-* diff --git a/plans/tmt.fmf b/plans/tmt.fmf index 4345cac..1589b5c 100644 --- a/plans/tmt.fmf +++ b/plans/tmt.fmf @@ -1,5 +1,10 @@ summary: Run tmt container provision test (downstream only) +enabled: false +adjust+: + - enabled: true + when: initiator != packit and distro != rhel + discover: how: fmf filter: 'tag:tmt & tag:downstream' @@ -14,9 +19,3 @@ 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 - -enabled: true -adjust+: - - enabled: false - when: revdeps == yes or distro == centos-stream-10 or distro == rhel-10 - because: TMT is not yet available on EL10 environments diff --git a/plans/toolbox.fmf b/plans/toolbox.fmf index eb6ffda..0aceed0 100644 --- a/plans/toolbox.fmf +++ b/plans/toolbox.fmf @@ -1,5 +1,20 @@ summary: Run toolbox tests (downstream only) +enabled: false +adjust+: + - enabled: true + when: initiator != packit and distro == fedora + +provision: + how: artemis + hardware: + memory: ">= 16 GB" + cpu: + cores: ">= 4" + threads: ">=8" + disk: + - size: ">= 512 GB" + prepare: - name: packages how: install @@ -12,18 +27,3 @@ discover: execute: how: tmt - -provision: - how: artemis - hardware: - memory: ">= 16 GB" - cpu: - cores: ">= 4" - threads: ">=8" - disk: - - size: ">= 512 GB" - -enabled: false -adjust: - - enabled: true - when: distro == fedora and initiator != packit diff --git a/podman.spec b/podman.spec index 085f09e..11bd1ec 100644 --- a/podman.spec +++ b/podman.spec @@ -13,6 +13,8 @@ %define build_with_btrfs 1 # qemu-system* isn't packageed for CentOS Stream / RHEL %define qemu 1 +# bats is included in the default repos (No epel/copr etc.) +%define distro_bats 1 %endif %if %{defined copr_username} @@ -58,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.5.2 +Version: 5.6.0~rc1 # 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 @@ -94,7 +96,7 @@ BuildRequires: shadow-utils-subid-devel BuildRequires: pkgconfig BuildRequires: make BuildRequires: man-db -BuildRequires: ostree-devel +BuildRequires: sqlite-devel BuildRequires: systemd BuildRequires: systemd-devel Requires: catatonit @@ -142,7 +144,7 @@ pages and %{name}. Summary: Tests for %{name} Requires: %{name} = %{epoch}:%{version}-%{release} -%if %{defined fedora} +%if %{defined distro_bats} Requires: bats %endif Requires: attr @@ -160,7 +162,8 @@ Requires: xfsprogs %description tests %{summary} -This package contains system tests for %{name} +This package contains system tests for %{name}. Only intended to be used for +gating tests. Not supported for end users / customers. %package remote Summary: (Experimental) Remote client for managing %{name} containers @@ -244,13 +247,13 @@ 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="e7d8226745ba07a64b7176a7f128e4ef53225a0e" +GIT_COMMIT="a3a6d9cc332bfda817d04796968264dd3c03e462" LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT" # build rootlessport first %gobuild -o bin/rootlessport ./cmd/rootlessport -export BASEBUILDTAGS="seccomp $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)" +export BASEBUILDTAGS="seccomp $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh) libsqlite3 grpcnotrace" # libtrust_openssl buildtag switches to using the FIPS-compatible func # `ecdsa.HashSign`. @@ -261,19 +264,19 @@ export BASEBUILDTAGS="$BASEBUILDTAGS libtrust_openssl" %endif # build %%{name} -export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh)" +export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh)" %gobuild -o bin/%{name} ./cmd/%{name} # build %%{name}-remote -export BUILDTAGS="$BASEBUILDTAGS exclude_graphdriver_btrfs btrfs_noversion remote" +export BUILDTAGS="$BASEBUILDTAGS exclude_graphdriver_btrfs remote" %gobuild -o bin/%{name}-remote ./cmd/%{name} # build quadlet -export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh)" +export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh)" %gobuild -o bin/quadlet ./cmd/quadlet # build %%{name}-testing -export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh)" +export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh)" %gobuild -o bin/podman-testing ./cmd/podman-testing # reset LDFLAGS for plugins binaries @@ -293,11 +296,6 @@ PODMAN_VERSION=%{version} %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} ETCDI install.remote \ install.testing -# See above for the iptables.conf declaration -%if %{defined fedora} && 0%{?fedora} < 41 -%{__make} DESTDIR=%{buildroot} MODULESLOADDIR=%{_modulesloaddir} install.modules-load -%endif - sed -i 's;%{buildroot};;g' %{buildroot}%{_bindir}/docker # do not include docker and podman-remote man pages in main package diff --git a/sources b/sources index a54bd48..cec2065 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.5.2.tar.gz) = c647e74c22053b95d09f81d9c594203492283bdb881245941fa2d7253946cbb4953d705313a0e57a0d6737cc07697381e8ba5ed388a74d440b74b5fe045821ec +SHA512 (v5.6.0-rc1.tar.gz) = 3de63a392de0b427cf7f729c081d3b6a6acc9776597a9962a343c40d29e26e217a43a2d4a7ddb23a914103de26abcbf0916de38e409872d6c2145e3649fd5ba6 diff --git a/test/tmt/system.fmf b/test/tmt/system.fmf index 3e5d52d..65f4dd0 100644 --- a/test/tmt/system.fmf +++ b/test/tmt/system.fmf @@ -1,14 +1,10 @@ require: - - attr - - bats - - podman-remote - podman-tests - psmisc - - slirp4netns environment: + # PODMAN_TESTING envvar is set in system.sh PODMAN: /usr/bin/podman - PODMAN_TESTING: /usr/bin/podman-testing QUADLET: /usr/libexec/podman/quadlet ROOTLESS_USER: "fedora" adjust+: @@ -18,13 +14,16 @@ adjust+: - when: distro == rhel environment+: ROOTLESS_USER: "cloud-user" + - when: initiator != "packit" + environment+: + RELEASE_TESTING: true /local-root: tag: [ local, root ] summary: local rootful test test: bash ./system.sh duration: 30m - + /local-rootless: tag: [ local, rootless ] summary: rootless test @@ -38,6 +37,8 @@ adjust+: duration: 30m environment+: PODMAN: /usr/bin/podman-remote + require+: + - podman-remote /remote-rootless: tag: [ remote, rootless ] @@ -46,3 +47,5 @@ adjust+: duration: 30m environment+: PODMAN: /usr/bin/podman-remote + require+: + - podman-remote diff --git a/test/tmt/system.sh b/test/tmt/system.sh index 9ed099f..3cd29da 100644 --- a/test/tmt/system.sh +++ b/test/tmt/system.sh @@ -12,6 +12,7 @@ rpm -q \ conmon \ container-selinux \ containers-common \ + criu \ crun \ netavark \ passt \ @@ -22,18 +23,18 @@ rpm -q \ systemd export system_service_cmd="/usr/bin/podman system service --timeout=0 &" -export test_cmd="whoami && cd /usr/share/podman/test/system && bats ." +export test_cmd="whoami && cd /usr/share/podman/test/system && PODMAN_TESTING=/usr/bin/podman-testing bats ." if [[ -z $1 ]]; then if [[ $PODMAN == "/usr/bin/podman-remote" ]]; then - eval $system_service_cmd + eval "$system_service_cmd" fi - eval $test_cmd + eval "$test_cmd" elif [[ $1 == "rootless" ]]; then if [[ $PODMAN == "/usr/bin/podman-remote" ]]; then su - "$ROOTLESS_USER" -c "eval $system_service_cmd" fi - su --whitelist-environment=$(cat ./tmt-envvars | tr '\n' ',') - "$ROOTLESS_USER" -c "eval $test_cmd" + su - "$ROOTLESS_USER" -c "eval $test_cmd" fi # Kill all podman processes for remote tests diff --git a/test/tmt/tmt-envvars b/test/tmt/tmt-envvars deleted file mode 100644 index 3ae53a1..0000000 --- a/test/tmt/tmt-envvars +++ /dev/null @@ -1,20 +0,0 @@ -TMT_TREE -TMT_PLAN_DATA -TMT_VERSION -TMT_TEST_NAME -TMT_TEST_DATA -TMT_TEST_SERIAL_NUMBER -TMT_TEST_ITERATION_ID -TMT_TEST_METADATA -TMT_SOURCE_DIR -TMT_REBOOT_COUNT -TMT_TEST_RESTART_COUNT -TMT_TOPOLOGY_BASH -TMT_TOPOLOGY_YAML -TMT_TEST_PIDFILE -TMT_TEST_PIDFILE_LOCK -TMT_TEST_PIDFILE_ROOT -PODMAN -PODMAN_TESTING -QUADLET -ROOTLESS_USER diff --git a/test/tmt/tmt.fmf b/test/tmt/tmt.fmf index 187fc1c..f016947 100644 --- a/test/tmt/tmt.fmf +++ b/test/tmt/tmt.fmf @@ -1,10 +1,9 @@ enabled: false adjust: enabled: true - when: initiator != packit and distro != rhel-10 or distro != centos-stream-10 - + when: initiator != packit && distro != rhel summary: Make sure that TMT container provision works -tag: [ tmt, downstream ] +tag: [downstream] require: - tmt+provision-container test: From 432485b9af427fafd7ea1a5da2731aed9957fa07 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 8 Aug 2025 17:29:42 +0000 Subject: [PATCH 36/45] Update to 5.6.0-rc2 upstream release Upstream tag: v5.6.0-rc2 Upstream commit: ec0652f4 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 4 ++-- sources | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f8517f1..d488b6a 100644 --- a/.gitignore +++ b/.gitignore @@ -1886,3 +1886,4 @@ /v5.5.1.tar.gz /v5.5.2.tar.gz /v5.6.0-rc1.tar.gz +/v5.6.0-rc2.tar.gz diff --git a/README.packit b/README.packit index dde2a46..3ad54d6 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.9.0.post1.dev4+g48b4c222. +The file was generated using packit 1.11.0. diff --git a/podman.spec b/podman.spec index 11bd1ec..456c521 100644 --- a/podman.spec +++ b/podman.spec @@ -60,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.6.0~rc1 +Version: 5.6.0~rc2 # 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 @@ -247,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="a3a6d9cc332bfda817d04796968264dd3c03e462" +GIT_COMMIT="ec0652f4ad4c6a5bb039ed6d749e06b7dadbab15" LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT" # build rootlessport first diff --git a/sources b/sources index cec2065..e883df9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.6.0-rc1.tar.gz) = 3de63a392de0b427cf7f729c081d3b6a6acc9776597a9962a343c40d29e26e217a43a2d4a7ddb23a914103de26abcbf0916de38e409872d6c2145e3649fd5ba6 +SHA512 (v5.6.0-rc2.tar.gz) = 9689d3641ca064a101cba0c38dae7adda47bfae49dff4c67a0a9798865e201b8f035abfbebbdda9003ccd393aa467571a4b7af3dc08206cc717c5f4aa0ad149c From 8d00804a67a2885eff452bba60453f0fda883bc5 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 15 Aug 2025 16:01:56 +0000 Subject: [PATCH 37/45] Update to 5.6.0 upstream release Upstream tag: v5.6.0 Upstream commit: da671ef6 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + podman.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d488b6a..98f7d78 100644 --- a/.gitignore +++ b/.gitignore @@ -1887,3 +1887,4 @@ /v5.5.2.tar.gz /v5.6.0-rc1.tar.gz /v5.6.0-rc2.tar.gz +/v5.6.0.tar.gz diff --git a/podman.spec b/podman.spec index 456c521..d5bfdeb 100644 --- a/podman.spec +++ b/podman.spec @@ -60,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.6.0~rc2 +Version: 5.6.0 # 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 @@ -247,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="ec0652f4ad4c6a5bb039ed6d749e06b7dadbab15" +GIT_COMMIT="da671ef6cfa3fc9ac6225c18f1dd0a70a951e43f" LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT" # build rootlessport first diff --git a/sources b/sources index e883df9..b060ee3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.6.0-rc2.tar.gz) = 9689d3641ca064a101cba0c38dae7adda47bfae49dff4c67a0a9798865e201b8f035abfbebbdda9003ccd393aa467571a4b7af3dc08206cc717c5f4aa0ad149c +SHA512 (v5.6.0.tar.gz) = 683f729ae02da1e95ed2a17d09e70f53e4218fd36c362970324d533d07ba250dfdb193c79f66a266b0250c27d8ef3bf6987f3264c721d2dfc74b81d91854ebb3 From d4e2b6bddd9fe86b5e59efbd4eb928bdaa960b2d Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 15 Aug 2025 18:35:10 -0500 Subject: [PATCH 38/45] Rebuild for golang-1.25.0 From 427484e864da658035ccd263759ca4e702b0562a Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 4 Sep 2025 20:57:37 +0000 Subject: [PATCH 39/45] Update to 5.6.1 upstream release Upstream tag: v5.6.1 Upstream commit: 1e2b2315 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 4 ++-- sources | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 98f7d78..da2ecc3 100644 --- a/.gitignore +++ b/.gitignore @@ -1888,3 +1888,4 @@ /v5.6.0-rc1.tar.gz /v5.6.0-rc2.tar.gz /v5.6.0.tar.gz +/v5.6.1.tar.gz diff --git a/README.packit b/README.packit index 3ad54d6..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.11.0. +The file was generated using packit 1.11.0.post1.dev7+gfdcdf3a32. diff --git a/podman.spec b/podman.spec index d5bfdeb..39cf2e5 100644 --- a/podman.spec +++ b/podman.spec @@ -60,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.6.0 +Version: 5.6.1 # 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 @@ -247,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="da671ef6cfa3fc9ac6225c18f1dd0a70a951e43f" +GIT_COMMIT="1e2b2315150b2ffa0971596fb5da8cd83f3ce0e1" LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT" # build rootlessport first diff --git a/sources b/sources index b060ee3..13dbece 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.6.0.tar.gz) = 683f729ae02da1e95ed2a17d09e70f53e4218fd36c362970324d533d07ba250dfdb193c79f66a266b0250c27d8ef3bf6987f3264c721d2dfc74b81d91854ebb3 +SHA512 (v5.6.1.tar.gz) = 146858b4e64c638a20c7865b294180c344a0fd7c4815a0f95c69abe04397c1aef53379e34f3f092184d663cc6f4967db2872a5aa969e1aa5a8f06c86ccbd14e1 From af62b0af36a9d8bd82306e4eb1a2bd6e245323c3 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 30 Sep 2025 19:44:12 +0000 Subject: [PATCH 40/45] Update to 5.6.2 upstream release Upstream tag: v5.6.2 Upstream commit: 9dd5e1ed Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + podman.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index da2ecc3..f36e502 100644 --- a/.gitignore +++ b/.gitignore @@ -1889,3 +1889,4 @@ /v5.6.0-rc2.tar.gz /v5.6.0.tar.gz /v5.6.1.tar.gz +/v5.6.2.tar.gz diff --git a/podman.spec b/podman.spec index 39cf2e5..d5f6bc5 100644 --- a/podman.spec +++ b/podman.spec @@ -60,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.6.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 @@ -247,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="1e2b2315150b2ffa0971596fb5da8cd83f3ce0e1" +GIT_COMMIT="9dd5e1ed33830612bc200d7a13db00af6ab865a4" LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT" # build rootlessport first diff --git a/sources b/sources index 13dbece..1c082db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.6.1.tar.gz) = 146858b4e64c638a20c7865b294180c344a0fd7c4815a0f95c69abe04397c1aef53379e34f3f092184d663cc6f4967db2872a5aa969e1aa5a8f06c86ccbd14e1 +SHA512 (v5.6.2.tar.gz) = 89f819da18a95b2f7d4d3dce1c34ee3e133a42ef87a78bd3a15cb5e8affed1671a2ce134518e37ca952ddb0ce086d47ed9a84ff98b941c6d55753c402e156b95 From ed2e1e69f9de715f8a4991475bb56cec26ddc98e Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 10 Oct 2025 11:11:11 -0500 Subject: [PATCH 41/45] Rebuild for golang 1.25.2 From 1919b5a958bd1f721a27e7b0ab9728cb8f89a980 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 19 Sep 2025 09:03:38 -0400 Subject: [PATCH 42/45] bump to v5.7.0-rc1 --- .gitignore | 1 + podman.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f36e502..5be4b02 100644 --- a/.gitignore +++ b/.gitignore @@ -1890,3 +1890,4 @@ /v5.6.0.tar.gz /v5.6.1.tar.gz /v5.6.2.tar.gz +/v5.7.0-rc1.tar.gz diff --git a/podman.spec b/podman.spec index d5f6bc5..2b1c59a 100644 --- a/podman.spec +++ b/podman.spec @@ -60,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.6.2 +Version: 5.7.0~rc1 # 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 diff --git a/sources b/sources index 1c082db..65add35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.6.2.tar.gz) = 89f819da18a95b2f7d4d3dce1c34ee3e133a42ef87a78bd3a15cb5e8affed1671a2ce134518e37ca952ddb0ce086d47ed9a84ff98b941c6d55753c402e156b95 +SHA512 (v5.7.0-rc1.tar.gz) = 8e97a65ee4fdca0c783167734cf83e04df66fe2e27efa3a06635f93c3211bffd736e4bfc2c15af91345acb2e288b24bc01a350d94dcff7fd0d87fa67b02ac67d From b84b597c897e9795274d5a0d8241b7bfcdcf6738 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 30 Oct 2025 14:36:25 +0000 Subject: [PATCH 43/45] Update to 5.7.0-rc2 upstream release Upstream tag: v5.7.0-rc2 Upstream commit: fa892f1d Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 3 --- README.packit | 2 +- podman.spec | 16 ++++++++++++++-- sources | 2 +- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5be4b02..6bf1629 100644 --- a/.gitignore +++ b/.gitignore @@ -1891,3 +1891,4 @@ /v5.6.1.tar.gz /v5.6.2.tar.gz /v5.7.0-rc1.tar.gz +/v5.7.0-rc2.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 54f9d8e..60c542e 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -92,9 +92,6 @@ 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 diff --git a/README.packit b/README.packit index fb341a1..2511bf4 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.11.0.post1.dev7+gfdcdf3a32. +The file was generated using packit 1.12.0. diff --git a/podman.spec b/podman.spec index 2b1c59a..9574462 100644 --- a/podman.spec +++ b/podman.spec @@ -15,6 +15,9 @@ %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} @@ -60,7 +63,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.0~rc1 +Version: 5.7.0~rc2 # 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 @@ -109,6 +112,10 @@ 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} @@ -247,7 +254,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="9dd5e1ed33830612bc200d7a13db00af6ab865a4" +GIT_COMMIT="fa892f1df01aacbbc3faf5ec941b39c29e9aa64f" LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT" # build rootlessport first @@ -265,6 +272,11 @@ 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 65add35..1a7ff23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.7.0-rc1.tar.gz) = 8e97a65ee4fdca0c783167734cf83e04df66fe2e27efa3a06635f93c3211bffd736e4bfc2c15af91345acb2e288b24bc01a350d94dcff7fd0d87fa67b02ac67d +SHA512 (v5.7.0-rc2.tar.gz) = f30ac0daacac1791b376ad36e337be3fa49b1e41b1b8f7138f1507dd2f6de24d6a2b5428b46951c687d66ebf23ee8b50bdf289fc49e708c06aaf3a749407d62f From 881f2a0de01f4d925fe6cb3481eada904fe3dd35 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 11 Nov 2025 19:04:56 +0000 Subject: [PATCH 44/45] Update to 5.7.0 upstream release Upstream tag: v5.7.0 Upstream commit: 0370128f Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 21 ++++++++++++++------- README.packit | 2 +- plans/system.fmf | 9 --------- podman.spec | 4 ++-- sources | 2 +- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 6bf1629..9f533a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1892,3 +1892,4 @@ /v5.6.2.tar.gz /v5.7.0-rc1.tar.gz /v5.7.0-rc2.tar.gz +/v5.7.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 60c542e..117c7b5 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -105,11 +105,6 @@ 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 @@ -126,12 +121,24 @@ 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 2511bf4..e03362b 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. +The file was generated using packit 1.12.0.post1.dev13+gd51655c23. diff --git a/plans/system.fmf b/plans/system.fmf index e41ffb8..b04c062 100644 --- a/plans/system.fmf +++ b/plans/system.fmf @@ -14,15 +14,6 @@ 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 9574462..023585d 100644 --- a/podman.spec +++ b/podman.spec @@ -63,7 +63,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.0~rc2 +Version: 5.7.0 # 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 @@ -254,7 +254,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="fa892f1df01aacbbc3faf5ec941b39c29e9aa64f" +GIT_COMMIT="0370128fc8dcae93533334324ef838db8f8da8cb" LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT" # build rootlessport first diff --git a/sources b/sources index 1a7ff23..9ab2336 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.7.0-rc2.tar.gz) = f30ac0daacac1791b376ad36e337be3fa49b1e41b1b8f7138f1507dd2f6de24d6a2b5428b46951c687d66ebf23ee8b50bdf289fc49e708c06aaf3a749407d62f +SHA512 (v5.7.0.tar.gz) = e53e3f6d441de7865733e085017ce1c3e0af5cb0ad0cf605f5d15e9813d38e1af22691d59498960ed7bd18e32ef003db4c151a4f4bd5bd0dbac69f4011851ff1 From ab91e7858ab72d5aaa3d9e051fc76e4f69dbc89c Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 10 Dec 2025 16:39:43 +0000 Subject: [PATCH 45/45] Update to 5.7.1 upstream release Upstream tag: v5.7.1 Upstream commit: f845d14e Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 4 ++-- sources | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9f533a1..5bb2950 100644 --- a/.gitignore +++ b/.gitignore @@ -1893,3 +1893,4 @@ /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/README.packit b/README.packit index e03362b..1d2f35b 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.12.0.post1.dev22+gfe66fd850. diff --git a/podman.spec b/podman.spec index 023585d..1475aed 100644 --- a/podman.spec +++ b/podman.spec @@ -63,7 +63,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.0 +Version: 5.7.1 # 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 @@ -254,7 +254,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="0370128fc8dcae93533334324ef838db8f8da8cb" +GIT_COMMIT="f845d14e941889ba4c071f35233d09b29d363c75" LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT" # build rootlessport first diff --git a/sources b/sources index 9ab2336..1ab124d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.7.0.tar.gz) = e53e3f6d441de7865733e085017ce1c3e0af5cb0ad0cf605f5d15e9813d38e1af22691d59498960ed7bd18e32ef003db4c151a4f4bd5bd0dbac69f4011851ff1 +SHA512 (v5.7.1.tar.gz) = 81fd4c27ff1d16dcb85229d4e4fd2cb06943ddfe966b5324fa8a8a957b2d2ec2aed7c5da05d6c009148f53b76545b27b0cba506622c8861f70bf7cad6c214a08