Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/cockpit-podman.git#b4718bf4719d8fef1b943a9c5fd8507efb42f3ed
This commit is contained in:
DistroBaker 2021-02-20 10:50:41 +00:00
parent 9daa15400c
commit 0b0e010a61
4 changed files with 17 additions and 16 deletions

1
.gitignore vendored
View File

@ -28,3 +28,4 @@
/cockpit-podman-27.1.tar.gz
/cockpit-podman-28.tar.gz
/cockpit-podman-28.1.tar.gz
/cockpit-podman-29.tar.gz

View File

@ -1,5 +1,5 @@
# This spec file has been automatically updated
Version: 28.1
Version: 29
Release: 1%{?dist}
#
# Copyright (C) 2017-2020 Red Hat, Inc.
@ -51,6 +51,12 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*
%{_datadir}/metainfo/*
%changelog
* Fri Feb 19 2021 Martin Pitt <martin@piware.de> - 29-1
- PatternFly 4 updates for a more consistent UI
- Accessibility fixes
- Add FMF tests for sharing tests with up- and downstream
* Thu Feb 11 2021 Matej Marusak <mmarusak@redhat.com> - 28.1-1
- Improve tests to be more robust against unstable Podman API

View File

@ -1 +1 @@
SHA512 (cockpit-podman-28.1.tar.gz) = 07eec273f452f269a041df0d20375ba27acbf1c150d81026693f9904a13e86062a41994556d735f82def85aca3e3d68aba602872a5fe381bbf161fdb6bd7ff09
SHA512 (cockpit-podman-29.tar.gz) = c3e42c57a3c2bfa3c9f9638553228acb69d50c3b5b0f04705a18d8bc0885a7d47f9abe3460a4f140a7456afa568baa05d92ec3c0085a4f0694b11f5d8f461a2e

View File

@ -12,20 +12,14 @@ LOGS="$(pwd)/logs"
mkdir -p "$LOGS"
chmod a+w "$LOGS"
# Install browser
# HACK: chromium 88 crashes with some keyDown commands: https://bugs.chromium.org/p/chromium/issues/detail?id=1170634
if rpm -q chromium-headless; then
dnf remove -y chromium-headless
fi
if grep -q 'ID=.*rhel' /etc/os-release; then
dnf install -y \
https://kojipkgs.fedoraproject.org//packages/chromium/87.0.4280.141/1.el8/x86_64/chromium-common-87.0.4280.141-1.el8.x86_64.rpm \
https://kojipkgs.fedoraproject.org//packages/chromium/87.0.4280.141/1.el8/x86_64/chromium-headless-87.0.4280.141-1.el8.x86_64.rpm
else
dnf install -y \
https://kojipkgs.fedoraproject.org//packages/chromium/87.0.4280.141/1.fc33/x86_64/chromium-common-87.0.4280.141-1.fc33.x86_64.rpm \
https://kojipkgs.fedoraproject.org//packages/chromium/87.0.4280.141/1.fc33/x86_64/chromium-headless-87.0.4280.141-1.fc33.x86_64.rpm
# install browser; on RHEL, use chromium from epel
# HACK: chromium-headless ought to be enough, but version 88 has a crash: https://bugs.chromium.org/p/chromium/issues/detail?id=1170634
if ! rpm -q chromium; then
if grep -q 'ID=.*rhel' /etc/os-release; then
dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
dnf config-manager --enable epel
fi
dnf install -y chromium
fi
# HACK: systemd kills the services after 90s