diff options
author | Yeoh Ee Peng <ee.peng.yeoh@intel.com> | 2018-11-22 17:10:43 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 22:27:45 +0000 |
commit | 3c7d4f0526340f47f4ebc078363b33d2bae11068 (patch) | |
tree | eacba0e5b9c1441659ad1b1725e00a9b383112eb | |
parent | e1b97539c8d00a2918adfbd78c2a9650583a2646 (diff) | |
download | poky-3c7d4f0526340f47f4ebc078363b33d2bae11068.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)
(From OE-Core rev: e4990ae01c9f3f486b4b745a2602795e9d496109)
Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oeqa/core/target/qemu.py | 5 | ||||
-rw-r--r-- | meta/lib/oeqa/runtime/context.py | 2 |
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 | |||
12 | supported_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic'] | 12 | supported_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic'] |
13 | 13 | ||
14 | class OEQemuTarget(OESSHTarget): | 14 | class 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 f3341b2e33..ffb846aace 100644 --- a/meta/lib/oeqa/runtime/context.py +++ b/meta/lib/oeqa/runtime/context.py | |||
@@ -98,7 +98,7 @@ class OERuntimeTestContextExecutor(OETestContextExecutor): | |||
98 | if target_type == 'simpleremote': | 98 | if target_type == 'simpleremote': |
99 | target = OESSHTarget(logger, target_ip, server_ip, **kwargs) | 99 | target = OESSHTarget(logger, target_ip, server_ip, **kwargs) |
100 | elif target_type == 'qemu': | 100 | elif target_type == 'qemu': |
101 | target = OEQemuTarget(logger, target_ip, server_ip, **kwargs) | 101 | target = OEQemuTarget(logger, server_ip, **kwargs) |
102 | else: | 102 | else: |
103 | # XXX: This code uses the old naming convention for controllers and | 103 | # XXX: This code uses the old naming convention for controllers and |
104 | # targets, the idea it is to leave just targets as the controller | 104 | # targets, the idea it is to leave just targets as the controller |