import cockpit-podman-33-1.module+el8.5.0+12136+c1ac9593

This commit is contained in:
CentOS Sources 2021-08-09 19:44:28 +00:00 committed by Andrew Lukoshko
parent e9bfae505d
commit c8f55d05e5
4 changed files with 8 additions and 28 deletions

View File

@ -1 +1 @@
b884079550e51359bbf5c81a849b20b8dcbe9e42 SOURCES/cockpit-podman-32.tar.gz
c96ca6c4190cdf4d7d506090d5bd173b4c6c76e3 SOURCES/cockpit-podman-33.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/cockpit-podman-32.tar.gz
SOURCES/cockpit-podman-33.tar.gz

View File

@ -1,22 +0,0 @@
From 524c56af2571d187097a1c5e271008b641babeb4 Mon Sep 17 00:00:00 2001
From: Matej Marusak <mmarusak@redhat.com>
Date: Tue, 20 Jul 2021 14:59:19 +0200
Subject: [PATCH] test: Don't check if user or system service failed to start
It seems that this can hit system podman as well.
---
test/check-application | 1 -
1 file changed, 1 deletion(-)
diff --git a/test/check-application b/test/check-application
index 04508c61..47cf95f0 100755
--- a/test/check-application
+++ b/test/check-application
@@ -110,7 +110,6 @@ class TestApplication(testlib.MachineCase):
b.wait_not_present("#overview div.pf-c-alert")
except testlib.Error:
if system:
- b.wait_in_text("#overview div.pf-c-alert .pf-c-alert__title", "User Podman service is also available")
b.click("#overview div.pf-c-alert .pf-c-alert__action > button:contains(Start)")
b.wait_not_present("#overview div.pf-c-alert")
else:

View File

@ -1,13 +1,12 @@
# This spec file has been automatically updated
Version: 32
Release: 2%{?dist}
Version: 33
Release: 1%{?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
Patch0: https://patch-diff.githubusercontent.com/raw/cockpit-project/cockpit-podman/pull/739.patch
BuildArch: noarch
BuildRequires: libappstream-glib
@ -19,7 +18,6 @@ The Cockpit user interface for Podman containers.
%prep
%setup -q -n cockpit-podman
%patch0 -p1
%build
# Nothing to build
@ -35,6 +33,10 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*
%{_datadir}/metainfo/*
%changelog
* Thu Aug 05 2021 Jindrich Novy <jnovy@redhat.com> - 33-1
- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/33
- Related: #1934415
* Wed Jul 21 2021 Jindrich Novy <jnovy@redhat.com> - 32-2
- attempt to fix gating tests - thanks for Matej Marusak
- Related: #1934415