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#7fbc43affc86ec0811786fef6684b78803e29e2a

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -202,3 +202,4 @@
 /cockpit-238.1.tar.xz
 /cockpit-239.tar.xz
 /cockpit-240.tar.xz
+/cockpit-241.tar.xz

cockpit.spec

@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        240
+Version:        241
 Release: 1%{?dist}
 #
 # Copyright (C) 2014-2020 Red Hat, Inc.
@@ -264,7 +264,7 @@ done
 for lib in systemd tmpfiles.d; do
     rm -r %{buildroot}/%{_prefix}/%{__lib}/$lib
 done
-for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-desktop; do
+for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-desktop cockpit-certificate-helper; do
     rm %{buildroot}/%{_libexecdir}/$libexec
 done
 rm -r %{buildroot}/%{_libdir}/security %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d
@@ -481,6 +481,7 @@ authentication via sssd/FreeIPA.
 %{_libexecdir}/cockpit-wsinstance-factory
 %{_libexecdir}/cockpit-tls
 %{_libexecdir}/cockpit-desktop
+%{_libexecdir}/cockpit-certificate-helper
 %attr(4750, root, cockpit-wsinstance) %{_libexecdir}/cockpit-session
 %{_datadir}/cockpit/branding
 
@@ -679,6 +680,10 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Wed Mar 31 2021 Simon Kobyda <skobyda@redhat.com> - 241-1
+
+- kdump: redesign the page
+
 * Wed Mar 17 2021 Marius Vollmer <mvollmer@redhat.com> - 240-1
 - New localization: Norwegian Bokmål
 - Performance metrics: Journal integration

plans/upstream.fmf

@@ -0,0 +1,7 @@
+discover:
+  how: fmf
+  repository: https://github.com/cockpit-project/cockpit
+  # FIXME: get rid of the hardcoding: https://github.com/psss/tmt/issues/585
+  ref: "241"
+execute:
+  how: tmt

sources

@@ -1 +1 @@
-SHA512 (cockpit-240.tar.xz) = dc5a4dc26aace653f1cc1cdd734a7422529bf9a116b3b98fc6cb08e109096f3cd17022a0c3ddfbd91faa43600ab902f710643069e658176a49b60d34596ceee3
+SHA512 (cockpit-241.tar.xz) = ebac207f4795b1c8aee844476807f68b8481bd86e8182cf8ec6b97cfc3ce4ab863c093763f7ce11ba1a4b99f5a85f69ea68cc2de5f76f9ffc6594d0a3b2a8814

tests/run-test.sh

@@ -1,111 +0,0 @@
-#!/bin/sh
-set -eux
-
-cd "$SOURCE"
-
-. /etc/os-release
-test_optional=
-test_basic=
-
-if ls ../cockpit-appstream* 1> /dev/null 2>&1; then
-    test_optional=1
-else
-    test_basic=1
-fi
-
-if [ "$ID" = "fedora" ]; then
-    test_basic=1
-    test_optional=1
-fi
-
-# tests need cockpit's bots/ libraries
-git clone --depth=1 https://github.com/cockpit-project/bots
-
-export TEST_OS="${ID}-${VERSION_ID/./-}"
-# HACK: upstream does not yet know about rawhide
-if [ "$TEST_OS" = "fedora-34" ]; then
-    export TEST_OS=fedora-33
-fi
-
-# HACK: CI hits this selinux denial. Unrelated to our tests.
-export TEST_ALLOW_JOURNAL_MESSAGES=".*Permission denied:.*/var/cache/app-info/xmls.*"
-
-# select tests
-TESTS=""
-EXCLUDES=""
-RC=0
-if [ -n "$test_optional" ]; then
-    # pre-download cirros image for Machines tests
-    bots/image-download cirros
-
-    # triggers SELinux violation
-    # See journal: SELinux is preventing /usr/libexec/qemu-kvm from open access on the file /var/lib/cockpittest/nfs_pool/nfs-volume-0.
-    EXCLUDES="$EXCLUDES TestMachinesDisks.testAddDiskNFS"
-    # not investigated yet
-    EXCLUDES="$EXCLUDES
-        TestAutoUpdates.testPrivilegeChange"
-
-    # TestUpdates: we can't run rebooting tests
-    TESTS="$TESTS
-         TestAutoUpdates
-         TestStorage
-         TestUpdates.testBasic
-         TestUpdates.testSecurityOnly"
-
-    # Fedora gating tests are running on infra without /dev/kvm; Machines tests are too darn slow there
-    if [ "$ID" = "fedora" ]; then
-        TESTS="$TESTS TestMachinesCreate.testCreateImportDisk"
-    else
-        TESTS="$TESTS TestMachines"
-    fi
-fi
-
-if [ -n "$test_basic" ]; then
-    # still too unstable
-    EXCLUDES="$EXCLUDES TestFirewall.testNetworkingPage"
-
-    # TODO: fix for CI environment
-    EXCLUDES="$EXCLUDES TestLogin.testTally"
-    EXCLUDES="$EXCLUDES TestAccounts.testBasic"
-
-    # PCI devices list is not predictable
-    EXCLUDES="$EXCLUDES TestSystemInfo.testHardwareInfo"
-
-    # Known issue #1008
-    EXCLUDES="$EXCLUDES TestTuned.testBasic"
-
-    TESTS="$TESTS
-        TestAccounts
-        TestBonding
-        TestBridge
-        TestFirewall
-        TestKdump
-        TestLogin
-        TestNetworking
-        TestServices
-        TestSOS
-        TestSystemInfo
-        TestTeam
-        TestTerminal
-        TestTuned
-        "
-fi
-
-exclude_options=""
-for t in $EXCLUDES; do
-    exclude_options="$exclude_options --exclude $t"
-done
-
-# execute run-tests
-test/common/run-tests --test-dir test/verify --nondestructive $exclude_options \
-    --machine localhost:22 --browser localhost:9090 $TESTS || RC=$?
-
-# check-shell-menu is not @nondestructive yet, keep it last
-if [ -n "$test_basic" ]; then
-    test/verify/check-shell-menu --machine localhost:22 --browser localhost:9090 || RC=$?
-fi
-
-echo $RC > "$LOGS/exitcode"
-cp --verbose Test* "$LOGS" || true
-# deliver test result via exitcode file
-exit 0

tests/tests.yml

@@ -1,39 +0,0 @@
----
-- hosts: localhost
-  roles:
-  - role: standard-test-source
-    tags:
-    - always
-
-  - role: standard-test-basic
-    tags:
-    - atomic
-    - classic
-    required_packages:
-    - cockpit
-    - cockpit-tests
-    - cockpit-machines
-    - cockpit-sosreport
-    - cockpit-storaged
-    - createrepo_c
-    - cryptsetup
-    - dnf-automatic
-    - firewalld
-    - git
-    - libvirt-daemon-config-network
-    - libvirt-python3
-    - make
-    - NetworkManager-team
-    - nodejs
-    - python3
-    - sssd-dbus
-    - targetcli
-    - tlog
-    tests:
-    - smoke:
-        dir: ./source/tools/debian/tests/
-        run: ./smoke
-    - verify:
-        dir: .
-        run: ./verify.sh
-        save-files: ["logs/*"]

tests/verify.sh

@@ -1,59 +0,0 @@
-#!/bin/sh
-set -eux
-
-TESTS="$(realpath $(dirname "$0"))"
-if [ -d source ]; then
-    # path for standard-test-source
-    SOURCE="$(pwd)/source"
-else
-    SOURCE="$(realpath $TESTS/..)"
-fi
-LOGS="$(pwd)/logs"
-mkdir -p "$LOGS"
-chmod a+w "$LOGS"
-
-# 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
-
-# make libpwquality less aggressive, so that our "foobar" password works
-printf 'dictcheck = 0\nminlen = 6\n' >> /etc/security/pwquality.conf
-
-# set root password for logging in
-echo root:foobar | chpasswd
-
-# create user account for logging in
-if ! id admin 2>/dev/null; then
-    useradd -c Administrator -G wheel admin
-    echo admin:foobar | chpasswd
-fi
-
-# create user account for running the test
-if ! id runtest 2>/dev/null; then
-    useradd -c 'Test runner' runtest
-    # allow test to set up things on the machine
-    mkdir -p /root/.ssh
-    curl https://raw.githubusercontent.com/cockpit-project/bots/master/machine/identity.pub  >> /root/.ssh/authorized_keys
-    chmod 600 /root/.ssh/authorized_keys
-fi
-chown -R runtest "$SOURCE"
-
-# disable core dumps, we rather investigate them upstream where test VMs are accessible
-echo core > /proc/sys/kernel/core_pattern
-
-# make sure that we can access cockpit through the firewall
-systemctl start firewalld
-firewall-cmd --add-service=cockpit --permanent
-firewall-cmd --add-service=cockpit
-
-# Run tests as unprivileged user
-su - -c "env SOURCE=$SOURCE LOGS=$LOGS $TESTS/run-test.sh" runtest
-
-RC=$(cat $LOGS/exitcode)
-exit ${RC:-1}