testimage: Add testimage_dump_target to kwargs
RFC v2 1/2 testimage: Add testimage_dump_target to kwargs
This passes the list of commands to run on the OEQemuTarget when the TargetDumper needs to run in a test context due to a failure on the target.
This is added here as a kwargs because the 'd' dictionary is not available in the staticmethod getTarget in the OERuntimeTestContextExecutor class. The OEQemuTarget is different from the QemuTarget which already uses the list of commands from testimage_dump_target from 'd'. The create_dir() is needed to initialize the TargetDumper's dump_dir variable.
--- meta/classes/testimage.bbclass | 1 + meta/lib/oeqa/core/target/qemu.py | 4 ++++ 2 files changed, 5 insertions(+)
meta/classes/testimage.bbclass +1 -0
@@ -319,6 +319,7 @@ def testimage_main(d): target_kwargs['powercontrol_extra_args'] = d.getVar("TEST_POWERCONTROL_EXTRA_ARGS") or "" target_kwargs['serialcontrol_cmd'] = d.getVar("TEST_SERIALCONTROL_CMD") or None target_kwargs['serialcontrol_extra_args'] = d.getVar("TEST_SERIALCONTROL_EXTRA_ARGS") or "" + target_kwargs['testimage_dump_target'] = d.getVar("testimage_dump_target") or "" def export_ssh_agent(d): import os
meta/lib/oeqa/core/target/qemu.py +4 -0
@@ -12,6 +12,7 @@ from collections import defaultdict from .ssh import OESSHTarget from oeqa.utils.qemurunner import QemuRunner +from oeqa.utils.dump import TargetDumper supported_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic']
@@ -42,6 +43,9 @@ class OEQemuTarget(OESSHTarget): dump_host_cmds=dump_host_cmds, logger=logger, serial_ports=serial_ports, boot_patterns = boot_patterns, use_ovmf=ovmf) + dump_target_cmds = kwargs.get("testimage_dump_target") + self.target_dumper = TargetDumper(dump_target_cmds, dump_dir, self.runner) + self.target_dumper.create_dir("qemu") def start(self, params=None, extra_bootparams=None, runqemuparams=''): if self.use_slirp and not self.server_ip:
Signature · 1 line
2.25.1
RFC v2 2/2 target/ssh.py: Add dump_target support
This adds the dump_target support when the ssh command fails with a 'No route to host'. This is will provide additional data when a Qemu target fails to respond during autobuilder testing. This does not fix 14002 [0], but may help track down why qemu looses networking
[0] https://bugzilla.yoctoproject.org/show_bug.cgi?id=14002
--- meta/lib/oeqa/core/target/ssh.py | 2 ++ 1 file changed, 2 insertions(+)
meta/lib/oeqa/core/target/ssh.py +2 -0
@@ -88,6 +88,8 @@ class OESSHTarget(OETarget): status, output = self._run(sshCmd, processTimeout, True) self.logger.debug('Command: %s\nOutput: %s\n' % (command, output)) + if status and output in ('No route to host'): + self.target.target_dumper.dump_target() return (status, output) def copyTo(self, localSrc, remoteDst):
Signature · 1 line
2.25.1