Skip to content

Commit

Permalink
Handle grubby, different distros, kexec option and other
Browse files Browse the repository at this point in the history 
This code changes include grubby command to handle newly
installed kernel and vmlinux name for all distros, also
verify if the installed kernel is actually booted and
rearrange the code to include both kexec and reboot way

Signed-off-by: Abdul Haleem <[email protected]>
  • Loading branch information
@abdhaleegit
abdhaleegit committed May 27, 2024
1 parent ff538b4 commit cadb973
Showing 1 changed file with 39 additions and 42 deletions.
81 changes: 39 additions & 42 deletions testcases/InstallUpstreamKernel.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
from common.OpTestSystem import OpSystemState
from common.OpTestSOL import OpSOLMonitorThread
from common.OpTestInstallUtil import InstallUtil
from common.OpTestUtil import OpTestUtil

log = OpTestLogger.optest_logger_glob.get_logger(__name__)

Expand All @@ -52,6 +53,8 @@ def setUp(self):
self.patch = self.conf.args.git_patch
self.use_kexec = self.conf.args.use_kexec
self.append_kernel_cmdline = self.conf.args.append_kernel_cmdline
self.util = OpTestUtil(OpTestConfiguration.conf)
self.host_distro_name = self.util.distro_name()
if self.config_path:
self.config = "olddefconfig"
if not self.repo:
Expand Down Expand Up @@ -115,82 +118,76 @@ def is_url(path):
self.config_path, sourcedir="", dstdir=os.path.join(linux_path, ".config"))
con.run_command("make %s" % self.config)
# Capture kernel version & release
res = con.run_command("make kernelrelease")
ker_ver = con.run_command("make kernelrelease")[-1]
sha = con.run_command("git rev-parse HEAD")
tcommit = con.run_command("export 'TERM=xterm-256color';git show -s --format=%ci")
tcommit = re.sub(r"\x1b\[[0-9;]*[mGKHF]", "", tcommit[1])
log.info("Upstream kernel version: %s", res[-1])
log.info("Upstream kernel version: %s", ker_ver)
log.info("Upstream kernel commit-id: %s", sha[-1])
log.info("Upstream kernel commit-time: %s", tcommit)
log.debug("Compile and install linux kernel")
con.run_command("make -j %d -s && make modules_install && make install" %
onlinecpus, timeout=self.host_cmd_timeout)
time.sleep(10)
if self.host_distro_name in ['rhel', 'Red Hat', 'ubuntu', 'Ubuntu']:
gruby_cmd = 'grubby --set-default'
elif self.host_distro_name in ['sles', 'SLES']:
gruby_cmd = 'grub2-set-default'
else:
raise self.skipTest("Unsupported OS")
con.run_command("%s /boot/vmlinu*-%s" % (gruby_cmd, ker_ver))
if not self.use_kexec:
# FIXME: Handle distributions which do not support grub
con.run_command(
"grub2-mkconfig --output=/boot/grub2/grub.cfg")
log.debug("Rebooting after kernel install...")
self.console_thread.console_terminate()
self.prompt = self.cv_SYSTEM.util.build_prompt()
self.console_thread.console_terminate()
con.close()
for i in range(5):
raw_pty = self.wait_for(self.cv_SYSTEM.console.get_console, timeout=20)
time.sleep(10)
if raw_pty is not None:
raw_pty.sendline("uname -r")
break
raw_pty.sendline("reboot")
raw_pty.expect("login:", timeout=600)
raw_pty.close()
boot_cmd = 'reboot'
else:
self.console_thread.console_terminate()
cmdline = con.run_command("cat /proc/cmdline")[-1]
if self.append_kernel_cmdline:
cmdline += " %s" % self.append_kernel_cmdline
kern_rel_str = con.run_command(
"cat %s/include/config/kernel.release" % linux_path)[-1]
try:
initrd_file = con.run_command(
"ls -l /boot/initr*-%s.img" % kern_rel_str)[-1].split(" ")[-1]
"ls -l /boot/initr*-%s.img" % ker_ver)[-1].split(" ")[-1]
except Exception:
initrd_file = con.run_command(
"ls -l /boot/initr*-%s" % kern_rel_str)[-1].split(" ")[-1]
"ls -l /boot/initr*-%s" % ker_ver)[-1].split(" ")[-1]
kexec_cmdline = "kexec --initrd %s --command-line=\"%s\" /boot/vmlinu*-%s -l" % (
initrd_file, cmdline, kern_rel_str)
initrd_file, cmdline, ker_ver)
# Let's makesure we set the default boot index to current kernel
# to avoid leaving host in unstable state incase boot failure
res = con.run_command("cat /etc/os-release")
if "Ubuntu" in res[0] or "Ubuntu" in res[1]:
if self.host_distro_name in ['rhel', 'Red Hat', 'ubuntu', 'Ubuntu']:
con.run_command(
'grubby --set-default /boot/vmlinu*-`uname -r`')
elif 'Red Hat' in res[0] or 'Red Hat' in res[1]:
con.run_command(
'grubby --set-default /boot/vmlinu*-`uname -r`')
elif 'SLES' in res[0] or 'SLES' in res[1]:
con.run_command(
'grub2-set-default /boot/vmlinu*-`uname -r`')
else:
raise self.skipTest("Unsupported OS")
'%s /boot/vmlinu*-`uname -r`' % gruby_cmd)
elif self.host_distro_name in ['sles', 'SLES']:
con.run_command('%s /boot/vmlinu*-`uname -r`' % gruby_cmd)
con.run_command(
"grub2-mkconfig --output=/boot/grub2/grub.cfg")
con.run_command(kexec_cmdline)
con.close()
raw_pty = self.cv_SYSTEM.console.get_console()
raw_pty.sendline("reboot")
raw_pty.expect("login:", timeout=600)
boot_cmd = 'kexec -e'
self.console_thread.console_terminate()
self.cv_SYSTEM.util.build_prompt()
self.console_thread.console_terminate()
con.close()
for i in range(5):
raw_pty = self.wait_for(self.cv_SYSTEM.console.get_console, timeout=20)
time.sleep(10)
if raw_pty is not None:
raw_pty.sendline("uname -r")
break
raw_pty.sendline(boot_cmd)
raw_pty.expect("login:", timeout=600)
raw_pty.close()
con = self.cv_SYSTEM.cv_HOST.get_ssh_connection()
res = con.run_command("uname -r")
log.info("Installed upstream kernel version: %s", res[-1])
res = con.run_command("uname -r")[-1]
log.info("Installed upstream kernel version: %s", res)
if ker_ver != res:
self.fail("Upstream kernel did not boot")
if self.conf.args.host_cmd:
con.run_command(self.conf.args.host_cmd,
timeout=self.host_cmd_timeout)
self.cv_HOST.host_gather_opal_msg_log()
self.cv_HOST.host_gather_kernel_log()
finally:
if self.console_thread.isAlive():
self.console_thread.console_terminate()
self.console_thread.console_terminate()

def wait_for(self, func, timeout, first=0.0, step=1.0, text=None, args=None, kwargs=None):
args = args or []
Expand Down

0 comments on commit cadb973

Please sign in to comment.