import cockpit-podman-29-2.module+el8.5.0+10306+3f72d66d

This commit is contained in:
CentOS Sources 2021-10-05 23:36:20 -04:00 committed by Stepan Oksanichenko
parent 01db9fe007
commit bb1ee6c0bb
2 changed files with 35 additions and 1 deletions

View File

@ -0,0 +1,24 @@
From d4f06e0e0b9529bfa3d17c1ef73c028752ee1bb7 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin@piware.de>
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:

View File

@ -1,12 +1,15 @@
# This spec file has been automatically updated
Version: 29
Release: 1%{?dist}
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
@ -19,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
@ -33,6 +39,10 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*
%{_datadir}/metainfo/*
%changelog
* Thu Mar 11 2021 Jindrich Novy <jnovy@redhat.com> - 29-2
- fix gating test failure for cockpit-podman
- Related: #1934415
* Mon Feb 22 2021 Jindrich Novy <jnovy@redhat.com> - 29-1
- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/29
- Related: #1883490