From f850cd316ae34ad363f7703e04ae34a14e0e0d7c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 18 2021 06:43:40 +0000 Subject: import cockpit-podman-29-2.module+el8.4.0+10607+f4da7515 --- diff --git a/.cockpit-podman.metadata b/.cockpit-podman.metadata index 97077e3..1285362 100644 --- a/.cockpit-podman.metadata +++ b/.cockpit-podman.metadata @@ -1 +1 @@ -95ffa11c361ca2958d692219f884b10a31b424a6 SOURCES/cockpit-podman-27.1.tar.gz +77aa54b1a76e5f42600de56f980ce4b3176d64d3 SOURCES/cockpit-podman-29.tar.gz diff --git a/.gitignore b/.gitignore index 9b16e3b..7b05f49 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cockpit-podman-27.1.tar.gz +SOURCES/cockpit-podman-29.tar.gz diff --git a/SOURCES/cockpit-podman-1937863.patch b/SOURCES/cockpit-podman-1937863.patch new file mode 100644 index 0000000..a802707 --- /dev/null +++ b/SOURCES/cockpit-podman-1937863.patch @@ -0,0 +1,24 @@ +From d4f06e0e0b9529bfa3d17c1ef73c028752ee1bb7 Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Thu, 4 Mar 2021 20:11:47 +0100 +Subject: [PATCH] test: Generalize cgroupsV2() for all rhel-8-* versions + +It looks like RHEL newer 8.y versions won't get cgroupsv2 either, so +generalize the check. +--- + test/check-application | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/check-application b/test/check-application +index 0b163ce7..a40f2d90 100755 +--- a/test/check-application ++++ b/test/check-application +@@ -80,7 +80,7 @@ class TestApplication(testlib.MachineCase): + self.has_selinux = self.machine.image not in ["debian-testing", "ubuntu-stable"] + + def cgroupsV2(self): +- return self.machine.image not in ["ubuntu-stable", "rhel-8-4"] ++ return self.machine.image != 'ubuntu-stable' and not self.machine.image.startswith('rhel-8') + + def execute(self, system, cmd): + if system: diff --git a/SPECS/cockpit-podman.spec b/SPECS/cockpit-podman.spec index 26f85e9..e649f01 100644 --- a/SPECS/cockpit-podman.spec +++ b/SPECS/cockpit-podman.spec @@ -1,17 +1,19 @@ # This spec file has been automatically updated -Version: 27.1 -Release: 3%{?dist} +Version: 29 +Release: 2%{?dist} Name: cockpit-podman Summary: Cockpit component for Podman containers License: LGPLv2+ URL: https://github.com/cockpit-project/cockpit-podman Source0: https://github.com/cockpit-project/cockpit-podman/releases/download/%{version}/cockpit-podman-%{version}.tar.gz +# related bug: https://bugzilla.redhat.com/show_bug.cgi?id=1937863 +# patch: https://patch-diff.githubusercontent.com/raw/cockpit-project/cockpit-podman/pull/688.patch +Patch0: cockpit-podman-1937863.patch BuildArch: noarch BuildRequires: libappstream-glib Requires: cockpit-bridge >= 138 -Requires: cockpit-shell >= 138 Requires: podman >= 1.3.0 %description @@ -20,6 +22,9 @@ The Cockpit user interface for Podman containers. %prep %setup -q -n cockpit-podman +# https://bugzilla.redhat.com/show_bug.cgi?id=1937863 +%patch0 -p1 + %build # Nothing to build @@ -34,47 +39,75 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/* %{_datadir}/metainfo/* %changelog -* Mon Jan 11 2021 Jindrich Novy - 27.1-3 -- run much more tests - patch from Matej Marusak -- Related: #1888571 +* Fri Mar 12 2021 Jindrich Novy - 29-2 +- fix gating test failure for cockpit-podman +- Related: #1914884 + +* Mon Feb 22 2021 Jindrich Novy - 29-1 +- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/29 +- Related: #1883490 + +* Fri Feb 12 2021 Jindrich Novy - 28.1-1 +- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/28.1 +- Related: #1883490 + +* Wed Feb 10 2021 Jindrich Novy - 28-4 +- readd cockpit-system +Related: #1914884 + +* Mon Feb 08 2021 Jindrich Novy - 28-3 +- fix gating tests for cockpit-podman - thanks for Matej Marusak +- Related: #1883490 + +* Sat Feb 06 2021 Jindrich Novy - 28-2 +- remove applied patch and cockpit-shell dependency +- Related: #1883490 + +* Sat Feb 06 2021 Jindrich Novy - 28-1 +- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/28 +- Related: #1883490 + +* Mon Jan 18 2021 Jindrich Novy - 27.1-4 +- fix "Fix gating tests of container-tools for 8.4.0" +- Related: #1883490 + +* Fri Jan 15 2021 Jindrich Novy - 27.1-3 +- another gating test fix - don't remove all containers but only admin ones + thanks to Matej Marusak +- Related: #1883490 * Fri Jan 08 2021 Jindrich Novy - 27.1-2 - gating tests - always set VM password -- Related: #1888571 +- Related: #1883490 * Thu Jan 07 2021 Jindrich Novy - 27.1-1 - update to https://github.com/cockpit-project/cockpit-podman/releases/tag/27.1 -- Related: #1888571 +- Related: #1883490 * Thu Jan 07 2021 Jindrich Novy - 27-1 - update to https://github.com/cockpit-project/cockpit-podman/releases/tag/27 -- Related: #1888571 +- Related: #1883490 * Thu Dec 10 2020 Jindrich Novy - 26-1 - update to https://github.com/cockpit-project/cockpit-podman/releases/tag/26 -- Related: #1888571 - -* Tue Dec 08 2020 Jindrich Novy - 25-5 -- remove redundant patch -- Related: #1888571 +- Related: #1883490 * Thu Dec 03 2020 Jindrich Novy - 25-4 - replace docker.io with quay.io for gating tests due do docker.io new pull rate limit requirements -- Related: #1888571 +- Related: #1883490 * Sat Nov 07 2020 Jindrich Novy - 25-3 - test: Cleanup images before pulling the ones we need - thanks to Matej Marusak -- Related: #1888571 +- Related: #1883490 * Tue Nov 03 2020 Jindrich Novy - 25-2 - remove hack in tests -- add LICENSE -- Related: #1888571 +- Related: #1883490 -* Thu Oct 22 2020 Jindrich Novy - 25-1 -- synchronize with stream-container-tools-rhel8-rhel-8.4.0 -- Related: #1888571 +* Wed Oct 21 2020 Jindrich Novy - 25-1 +- synchronize with stream-container-tools-rhel8 +- Related: #1883490 * Sun Jul 26 2020 Jindrich Novy - 18.1-2 - revert back to 18.1 as this version is aimed at 8.3.0