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.git#5a5632c5509a282f4fb7b5cf84e9ccb545081548

.gitignore

@@ -198,3 +198,4 @@
 /cockpit-235.tar.xz
 /cockpit-236.tar.xz
 /cockpit-237.tar.xz
+/cockpit-238.tar.xz

cockpit.spec

@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        237
+Version:        238
 Release: 1%{?dist}
 #
 # Copyright (C) 2014-2020 Red Hat, Inc.
@@ -61,7 +61,7 @@ License:        LGPLv2+
 URL:            https://cockpit-project.org/
 
 %if %{defined wip}
-Source0:        cockpit-%{version}.tar.gz
+Source0:        cockpit-%{version}.tar.xz
 %else
 Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
 %endif
@@ -262,7 +262,6 @@ find %{buildroot}%{_datadir}/cockpit/static -type f >> static.list
 %if 0%{?build_basic} == 0
 for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh static systemd tuned users metrics; do
     rm -r %{buildroot}/%{_datadir}/cockpit/$pkg
-    rm -rf %{buildroot}/usr/src/debug/%{_datadir}/cockpit/$pkg
     rm -f %{buildroot}/%{_datadir}/metainfo/org.cockpit-project.cockpit-${pkg}.metainfo.xml
 done
 for data in doc locale man pixmaps polkit-1; do
@@ -283,7 +282,7 @@ rm -f %{buildroot}%{_datadir}/metainfo/cockpit.appdata.xml
 # when not building optional packages, remove their files
 %if 0%{?build_optional} == 0
 for pkg in apps machines packagekit pcp playground storaged; do
-    rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg %{buildroot}/usr/src/debug/%{_datadir}/cockpit/$pkg
+    rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg
 done
 # files from -tests
 rm -r %{buildroot}/%{_prefix}/%{__lib}/cockpit-test-assets
@@ -311,18 +310,6 @@ install -m 644 -D /dev/null %{buildroot}/run/cockpit/motd
 
 %define find_debug_info %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_include_minidebuginfo:-m} %{?_find_debuginfo_dwz_opts} %{?_find_debuginfo_opts} %{?_debugsource_packages:-S debugsourcefiles.list} "%{_builddir}/%{?buildsubdir}"
 
-# Redefine how debug info is built to slip in our extra debug files
-%define __debug_install_post   \
-   %{find_debug_info} \
-   cat debug.partial >> %{_builddir}/%{?buildsubdir}/debugfiles.list \
-%{nil}
-
-# Build the package lists for debug package, and move debug files to installed locations
-find %{buildroot}/usr/src/debug%{_datadir}/cockpit -type f -o -type l > debug.partial
-sed -i "s|%{buildroot}/usr/src/debug||" debug.partial
-sed -n 's/\.map\(\.gz\)\?$/\0/p' *.list >> debug.partial
-sed -i '/\.map\(\.gz\)\?$/d' *.list
-tar -C %{buildroot}/usr/src/debug -cf - . | tar -C %{buildroot} -xf -
 %endif
 # /suse_version
 rm -rf %{buildroot}/usr/src/debug
@@ -686,6 +673,7 @@ Summary: Cockpit user interface for packages
 BuildArch: noarch
 Requires: cockpit-bridge >= 186
 Requires: PackageKit
+Recommends: python3-tracer
 
 %description -n cockpit-packagekit
 The Cockpit components for installing OS updates and Cockpit add-ons,
@@ -698,6 +686,13 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Wed Feb 17 2021 Katerina Koukiou <kkoukiou@redhat.com> - 238-1
+
+- Updates: List outdated software that needs a restart
+- Web server: Preserve permissions of administrator-provided certificates
+- System: Performance page shows busiest CPU cores
+- Machines: VM disk creation supports a custom path
+
 * Thu Feb 04 2021 Matej Marusak <mmarusak@redhat.com> - 237-1
 
 - Restyling updates page in preparation for upcoming features

sources

@@ -1 +1 @@
-SHA512 (cockpit-237.tar.xz) = 56b1d6d6c97ced1d8fa7db281843b71656cb70d5a2226a520150a45156edb4bf2573671d244977433c25075798aed95eee624d296fbe4ad4181b77327ca8351b
+SHA512 (cockpit-238.tar.xz) = b2452c962fb114c8fee1a5d0210b3999bef8ba1c80133e918a45210f6cb566a60ad0c9ee514aff970a41310fae268b04954b4762c6fd6d8b411dbce2ef012879

tests/run-test.sh

@@ -48,10 +48,16 @@ if [ -n "$test_optional" ]; then
     # TestUpdates: we can't run rebooting tests
     TESTS="$TESTS
          TestAutoUpdates
-         TestMachines
          TestStorage
          TestUpdates.testBasic
          TestUpdates.testSecurityOnly"
+
+    # Fedora gating tests are running on infra without /dev/kvm; Machines tests are too darn slow there
+    if [ -w /dev/kvm ]; then
+        TESTS="$TESTS TestMachines"
+    else
+        TESTS="$TESTS TestMachinesCreate.testCreateImportDisk"
+    fi
 fi
 
 if [ -n "$test_basic" ]; then
@@ -91,12 +97,12 @@ for t in $EXCLUDES; do
 done
 
 # execute run-tests
-test/common/run-tests --test-dir test/verify --trace --verbose --nondestructive $exclude_options \
+test/common/run-tests --test-dir test/verify --nondestructive $exclude_options \
     --machine localhost:22 --browser localhost:9090 $TESTS || RC=$?
 
 # check-menu is not @nondestructive yet, keep it last
 if [ -n "$test_basic" ]; then
-    test/verify/check-menu -tv --machine localhost:22 --browser localhost:9090 || RC=$?
+    test/verify/check-menu --machine localhost:22 --browser localhost:9090 || RC=$?
 fi
 
 echo $RC > "$LOGS/exitcode"

tests/tests.yml

@@ -12,7 +12,6 @@
     required_packages:
     - cockpit
     - cockpit-tests
-    - cockpit-dashboard
     - cockpit-machines
     - cockpit-sosreport
     - cockpit-storaged

tests/verify.sh

@@ -1,20 +1,31 @@
 #!/bin/sh
 set -eux
 
-# from standard-test-source
+TESTS="$(realpath $(dirname "$0"))"
-SOURCE="$(pwd)/source"
+if [ -d source ]; then
+    # path for standard-test-source
+    SOURCE="$(pwd)/source"
+else
+    SOURCE="$(realpath $TESTS/..)"
+fi
 LOGS="$(pwd)/logs"
-TESTS="$(pwd)/tests"
 mkdir -p "$LOGS"
 chmod a+w "$LOGS"
 
 # install browser; on RHEL, use chromium from epel
-if ! rpm -q chromium-headless; then
+# HACK: chromium 88 crashes with some keyDown commands: https://bugs.chromium.org/p/chromium/issues/detail?id=1170634
-    if grep -q 'ID=.*rhel' /etc/os-release; then
+if rpm -q chromium-headless; then
-        dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
+    dnf remove -y chromium-headless
-        dnf config-manager --enable epel
+fi
-    fi
+
-    dnf install -y chromium-headless
+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
 fi
 
 # make libpwquality less aggressive, so that our "foobar" password works