Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix tests for current RHEL 9.0 #15737

Merged
merged 2 commits into from
Apr 23, 2021
Merged

Fix tests for current RHEL 9.0 #15737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0748bc2
test: Allow pmdakvm SELinux messages on RHEL 9.0 as well
martinpitt Apr 23, 2021
3ca4a5f
test: Use grubby to set crashkernel= option
martinpitt Apr 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/common/testlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1164,7 +1164,7 @@ def check_journal_messages(self, machine=None):
# Fedora and RHEL 9 have switched to dbus-broker
self.allowed_messages.append("dbus-daemon didn't send us a dbus address; not installed?.*")

if self.image in ['fedora-34']:
if self.image in ['fedora-34', 'rhel-9-0']:
# HACK: https://bugzilla.redhat.com/show_bug.cgi?id=1929259
self.allow_journal_messages('audit:.*denied.*comm="pmdakvm" lockdown_reason="debugfs access".*')

Expand Down
11 changes: 2 additions & 9 deletions test/verify/check-kdump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,8 @@ class TestKdump(MachineCase):
return new.join(li)

def enableKdump(self):
if self.machine.image in ["rhel-8-4", "rhel-8-5"]:
# these images use BootLoaderSpec and grubenv
self.sed_file('/^kernelopts=/ { s/crashkernel=[^ ]*//; s/$/ crashkernel=256M/; }', '/boot/grub2/grubenv')
else:
lines = self.machine.execute(command="cat /etc/default/grub", quiet=True).split("\n")
lines = map(lambda line: self.rreplace(line, '"', ' crashkernel=256M"', 1)
if line.startswith("GRUB_CMDLINE_LINUX") else line, lines)
self.machine.write("/etc/default/grub", "\n".join(lines))
self.machine.execute("grub2-mkconfig -o /boot/grub2/grub.cfg")
# all current Fedora/CentOS/RHEL images use BootLoaderSpec
self.machine.execute("grubby --args=crashkernel=256M --update-kernel=ALL")
self.machine.execute("mkdir -p /var/crash")

def enableLocalSsh(self):
Expand Down