summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorYeoh Ee Peng <ee.peng.yeoh@intel.com>2018-11-22 17:10:43 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-23 23:35:18 +0000
commit010c24307b96c233c7b478be00e4df4b1b93184d (patch)
tree89cb4985656247967f5cae8b008321f67ceffd32 /meta
parent3786729785f4d5a762d4f8883c7fe8d020e17bf0 (diff)
downloadpoky-010c24307b96c233c7b478be00e4df4b1b93184d.tar.gz
oeqa/qemu & runtime: qemu do not need ip input from external
Qemu do not use the ip input from external. It will retrieve ip from QemuRunner instance and assign ip value. (From OE-Core rev: 14d99dc6c39c963ba3e0d9a30274846bd5369210) Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/core/target/qemu.py5
-rw-r--r--meta/lib/oeqa/runtime/context.py2
2 files changed, 3 insertions, 4 deletions
diff --git a/meta/lib/oeqa/core/target/qemu.py b/meta/lib/oeqa/core/target/qemu.py
index bf3b633f04..538bf12b6a 100644
--- a/meta/lib/oeqa/core/target/qemu.py
+++ b/meta/lib/oeqa/core/target/qemu.py
@@ -12,15 +12,14 @@ from oeqa.utils.qemurunner import QemuRunner
12supported_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic'] 12supported_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic']
13 13
14class OEQemuTarget(OESSHTarget): 14class OEQemuTarget(OESSHTarget):
15 def __init__(self, logger, ip, server_ip, timeout=300, user='root', 15 def __init__(self, logger, server_ip, timeout=300, user='root',
16 port=None, machine='', rootfs='', kernel='', kvm=False, 16 port=None, machine='', rootfs='', kernel='', kvm=False,
17 dump_dir='', dump_host_cmds='', display='', bootlog='', 17 dump_dir='', dump_host_cmds='', display='', bootlog='',
18 tmpdir='', dir_image='', boottime=60, **kwargs): 18 tmpdir='', dir_image='', boottime=60, **kwargs):
19 19
20 super(OEQemuTarget, self).__init__(logger, ip, server_ip, timeout, 20 super(OEQemuTarget, self).__init__(logger, None, server_ip, timeout,
21 user, port) 21 user, port)
22 22
23 self.ip = ip
24 self.server_ip = server_ip 23 self.server_ip = server_ip
25 self.machine = machine 24 self.machine = machine
26 self.rootfs = rootfs 25 self.rootfs = rootfs
diff --git a/meta/lib/oeqa/runtime/context.py b/meta/lib/oeqa/runtime/context.py
index a7f3823996..943e29b0d9 100644
--- a/meta/lib/oeqa/runtime/context.py
+++ b/meta/lib/oeqa/runtime/context.py
@@ -101,7 +101,7 @@ class OERuntimeTestContextExecutor(OETestContextExecutor):
101 if target_type == 'simpleremote': 101 if target_type == 'simpleremote':
102 target = OESSHTarget(logger, target_ip, server_ip, **kwargs) 102 target = OESSHTarget(logger, target_ip, server_ip, **kwargs)
103 elif target_type == 'qemu': 103 elif target_type == 'qemu':
104 target = OEQemuTarget(logger, target_ip, server_ip, **kwargs) 104 target = OEQemuTarget(logger, server_ip, **kwargs)
105 else: 105 else:
106 # XXX: This code uses the old naming convention for controllers and 106 # XXX: This code uses the old naming convention for controllers and
107 # targets, the idea it is to leave just targets as the controller 107 # targets, the idea it is to leave just targets as the controller