Skip to content

Commit

Permalink
tools: Lower kdumpctl dependency to Recommends on RHEL
Browse files Browse the repository at this point in the history
Most of cockpit-system works fine without kdump functionality, and the
kdump page fails gracefully without it ("Kdump service is not installed"
alert). As recommends are installed by default, this is the right
dependency level.

kdump does not currently exist on RHEL/CentOS 10 [1], so skip the test
there.

[1] https://issues.redhat.com/browse/RHEL-35567
  • Loading branch information
martinpitt committed May 6, 2024
1 parent 92b6cae commit 5191374
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions test/verify/check-kdump
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ class KdumpHelpers(testlib.MachineCase):

@testlib.skipOstree("kexec-tools not installed")
@testlib.skipImage("kexec-tools not installed", "debian-*", "ubuntu-*", "arch")
@testlib.skipImage("https://issues.redhat.com/browse/RHEL-35567", "centos-10", "rhel-10*")
@testlib.timeout(900)
@testlib.skipDistroPackage()
class TestKdump(KdumpHelpers):
Expand Down Expand Up @@ -457,6 +458,7 @@ class TestKdump(KdumpHelpers):

@testlib.skipOstree("kexec-tools not installed")
@testlib.skipImage("kexec-tools not installed", "debian-*", "ubuntu-*", "arch")
@testlib.skipImage("https://issues.redhat.com/browse/RHEL-35567", "centos-10", "rhel-10*")
@testlib.timeout(900)
@testlib.skipDistroPackage()
class TestKdumpNFS(KdumpHelpers):
Expand Down
2 changes: 1 addition & 1 deletion tools/cockpit.spec
Original file line number Diff line number Diff line change
Expand Up @@ -328,11 +328,11 @@ Provides: cockpit-users = %{version}-%{release}
Obsoletes: cockpit-dashboard < %{version}-%{release}
%if 0%{?rhel}
Requires: NetworkManager >= 1.6
Requires: /usr/bin/kdumpctl
Requires: sos
Requires: sudo
Recommends: PackageKit
Recommends: setroubleshoot-server >= 3.3.3
Recommends: /usr/bin/kdumpctl
Suggests: NetworkManager-team
Provides: cockpit-kdump = %{version}-%{release}
Provides: cockpit-networkmanager = %{version}-%{release}
Expand Down

0 comments on commit 5191374

Please sign in to comment.