summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib/oeqa/controllers')
-rw-r--r--meta/lib/oeqa/controllers/masterimage.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/lib/oeqa/controllers/masterimage.py b/meta/lib/oeqa/controllers/masterimage.py
index f2585d4860..b03c5bf74b 100644
--- a/meta/lib/oeqa/controllers/masterimage.py
+++ b/meta/lib/oeqa/controllers/masterimage.py
@@ -28,6 +28,8 @@ class MasterImageHardwareTarget(oeqa.targetcontrol.BaseTarget):
28 28
29 __metaclass__ = ABCMeta 29 __metaclass__ = ABCMeta
30 30
31 supported_image_fstypes = ['tar.gz', 'tar.bz2']
32
31 def __init__(self, d): 33 def __init__(self, d):
32 super(MasterImageHardwareTarget, self).__init__(d) 34 super(MasterImageHardwareTarget, self).__init__(d)
33 35
@@ -48,7 +50,8 @@ class MasterImageHardwareTarget(oeqa.targetcontrol.BaseTarget):
48 bb.note("Server IP: %s" % self.server_ip) 50 bb.note("Server IP: %s" % self.server_ip)
49 51
50 # test rootfs + kernel 52 # test rootfs + kernel
51 self.rootfs = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True), d.getVar("IMAGE_LINK_NAME", True) + '.tar.gz') 53 self.image_fstype = self.get_image_fstype(d)
54 self.rootfs = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True), d.getVar("IMAGE_LINK_NAME", True) + '.' + self.image_fstype)
52 self.kernel = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True), d.getVar("KERNEL_IMAGETYPE")) 55 self.kernel = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True), d.getVar("KERNEL_IMAGETYPE"))
53 if not os.path.isfile(self.rootfs): 56 if not os.path.isfile(self.rootfs):
54 # we could've checked that IMAGE_FSTYPES contains tar.gz but the config for running testimage might not be 57 # we could've checked that IMAGE_FSTYPES contains tar.gz but the config for running testimage might not be
@@ -177,7 +180,7 @@ class GummibootTarget(MasterImageHardwareTarget):
177 'mount -t efivarfs efivarfs /sys/firmware/efi/efivars', 180 'mount -t efivarfs efivarfs /sys/firmware/efi/efivars',
178 'cp ~/test-kernel /boot', 181 'cp ~/test-kernel /boot',
179 'rm -rf /mnt/testrootfs/*', 182 'rm -rf /mnt/testrootfs/*',
180 'tar xzvf ~/test-rootfs.tar.gz -C /mnt/testrootfs', 183 'tar xvf ~/test-rootfs.%s -C /mnt/testrootfs' % self.image_fstype,
181 'printf "%s" > /sys/firmware/efi/efivars/LoaderEntryOneShot-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f' % self.efivarvalue 184 'printf "%s" > /sys/firmware/efi/efivars/LoaderEntryOneShot-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f' % self.efivarvalue
182 ] 185 ]
183 186
@@ -187,7 +190,7 @@ class GummibootTarget(MasterImageHardwareTarget):
187 # from now on, every deploy cmd should return 0 190 # from now on, every deploy cmd should return 0
188 # else an exception will be thrown by sshcontrol 191 # else an exception will be thrown by sshcontrol
189 self.master.ignore_status = False 192 self.master.ignore_status = False
190 self.master.copy_to(self.rootfs, "~/test-rootfs.tar.gz") 193 self.master.copy_to(self.rootfs, "~/test-rootfs." + self.image_fstype)
191 self.master.copy_to(self.kernel, "~/test-kernel") 194 self.master.copy_to(self.kernel, "~/test-kernel")
192 for cmd in self.deploy_cmds: 195 for cmd in self.deploy_cmds:
193 self.master.run(cmd) 196 self.master.run(cmd)