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#472849abbd0845f87c17cca8d78555d45f27c94a

.gitignore

@@ -197,3 +197,4 @@
 /cockpit-234.tar.xz
 /cockpit-235.tar.xz
 /cockpit-236.tar.xz
+/cockpit-237.tar.xz

cockpit.spec

@@ -1,6 +1,6 @@
 # This spec file has been automatically updated
-Version:        236
+Version:        237
-Release: 2%{?dist}
+Release: 1%{?dist}
 #
 # Copyright (C) 2014-2020 Red Hat, Inc.
 #
@@ -66,10 +66,11 @@ Source0:        cockpit-%{version}.tar.gz
 Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
 %endif
 
-# in RHEL the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system})
+# in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system})
 # and cockpit-appstream (building optional packages like cockpit-{machines,pcp})
 # This split does not apply to EPEL/COPR.
-%if 0%{?rhel} && 0%{?epel} == 0
+# In Fedora ELN/RHEL 9+ there is just one source package, which ships rpms in both BaseOS and AppStream
+%if 0%{?rhel} == 8 && 0%{?epel} == 0
 
 %if "%{name}" == "cockpit"
 %define build_basic 1
@@ -413,6 +414,7 @@ Provides: cockpit-shell = %{version}-%{release}
 Provides: cockpit-systemd = %{version}-%{release}
 Provides: cockpit-tuned = %{version}-%{release}
 Provides: cockpit-users = %{version}-%{release}
+Obsoletes: cockpit-dashboard
 %if 0%{?rhel}
 Provides: cockpit-networkmanager = %{version}-%{release}
 Obsoletes: cockpit-networkmanager
@@ -426,7 +428,6 @@ Recommends: setroubleshoot-server >= 3.3.3
 Provides: cockpit-selinux = %{version}-%{release}
 Provides: cockpit-sosreport = %{version}-%{release}
 Requires: sos
-Obsoletes: cockpit-dashboard
 %endif
 %if 0%{?fedora} >= 29
 # 0.7.0 (actually) supports task cancellation.
@@ -697,6 +698,11 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Thu Feb 04 2021 Matej Marusak <mmarusak@redhat.com> - 237-1
+
+- Restyling updates page in preparation for upcoming features
+- SSH connections to remote machines are only opened when necessary
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 236-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (cockpit-236.tar.xz) = 48068d739f89ca8f270d3a1ca5d0a44c8938ad8171ba7304e4560f1b98771af18b38bd8ff518bd2a312437a9d297b3ac3417e6ebad65af0e29b18efbd0f92de0
+SHA512 (cockpit-237.tar.xz) = 56b1d6d6c97ced1d8fa7db281843b71656cb70d5a2226a520150a45156edb4bf2573671d244977433c25075798aed95eee624d296fbe4ad4181b77327ca8351b

tests/run-test.sh

@@ -21,10 +21,6 @@ fi
 # tests need cockpit's bots/ libraries
 git clone --depth=1 https://github.com/cockpit-project/bots
 
-# only install a subset to save time/space
-rm package.json package-lock.json  # otherwise the command below installs *everything*, argh
-npm install axe-core chrome-remote-interface sizzle
-
 export TEST_OS="${ID}-${VERSION_ID/./-}"
 # HACK: upstream does not yet know about rawhide
 if [ "$TEST_OS" = "fedora-34" ]; then
@@ -72,11 +68,6 @@ if [ -n "$test_basic" ]; then
     # Known issue #1008
     EXCLUDES="$EXCLUDES TestTuned.testBasic"
 
-    # PAM bug in RHEL 8: it shouldn't pwquality the old password when having to set a new one, that's completely counter-productive and wrong
-    if [ "${TEST_OS#rhel}" != "$TEST_OS" ] || [ "$TEST_OS" = "fedora-31" ]; then
-        EXCLUDES="$EXCLUDES TestLogin.testExpired"
-    fi
-
     TESTS="$TESTS
         TestAccounts
         TestBonding

tests/tests.yml

@@ -25,7 +25,7 @@
     - libvirt-python3
     - make
     - NetworkManager-team
-    - npm
+    - nodejs
     - python3
     - sssd-dbus
     - targetcli