mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 21:49:33 +02:00
testimage: use the new targetcontrol.py module for running tests
This patch makes the necessary changes for using the targetcontrol.py module so that one can run the same tests on a qemu instance or a remote machine based on the value of TEST_TARGET variable: "qemu" or "simpleremote". The default value is "qemu" which starts a qemu instance and it's the with what we currently have. With "simpleremote", the remote machine must be up with network and ssh and you need to set TEST_TARGET_IP with the IP address of the remote machine (it can still be a qemu instance that was manually started). Basically testimage.bbclass now does something along the lines of: - load tests -> deploy (prepare) / start target -> run tests. There were a couple of changes necessary for tests and also some cleanups/renames that were needed to adjust this change. (use ip everywhere when refering to target and server_ip when refering to host/build machine) Also two unnecessary and unsed methods were dropped from sshcontrol. [ YOCTO #5554 ] (From OE-Core rev: a7820350fa3271d78ed7476e02f4aef593be1125) Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
fd2d16519d
commit
b4d9b4208b
@@ -46,7 +46,7 @@ class SmartRepoTest(SmartTest):
|
||||
|
||||
@classmethod
|
||||
def setUpClass(self):
|
||||
self.repo_server = HTTPService(oeRuntimeTest.tc.d.getVar('DEPLOY_DIR', True), oeRuntimeTest.tc.qemu.host_ip)
|
||||
self.repo_server = HTTPService(oeRuntimeTest.tc.d.getVar('DEPLOY_DIR', True), oeRuntimeTest.tc.target.server_ip)
|
||||
self.repo_server.start()
|
||||
|
||||
@classmethod
|
||||
@@ -58,7 +58,7 @@ class SmartRepoTest(SmartTest):
|
||||
|
||||
def test_smart_channel_add(self):
|
||||
image_pkgtype = self.tc.d.getVar('IMAGE_PKGTYPE', True)
|
||||
deploy_url = 'http://%s:%s/%s' %(self.tc.qemu.host_ip, self.repo_server.port, image_pkgtype)
|
||||
deploy_url = 'http://%s:%s/%s' %(self.target.server_ip, self.repo_server.port, image_pkgtype)
|
||||
pkgarchs = self.tc.d.getVar('PACKAGE_ARCHS', True)
|
||||
for arch in os.listdir('%s/%s' % (self.repo_server.root_dir, image_pkgtype)):
|
||||
if arch in pkgarchs:
|
||||
|
||||
Reference in New Issue
Block a user