summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2022-11-09 19:31:26 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-11-11 13:43:40 +0000
commit12b4cbbfee37cc9de1d1713f482a4cd6917648e2 (patch)
tree61f7c90a19b94a6c9620a6df8a01ec5afab14423
parentd72b13cef14fac5dbfff13df33ba2b9041d3a3bd (diff)
downloadpoky-12b4cbbfee37cc9de1d1713f482a4cd6917648e2.tar.gz
oeqa/selftest/imagefeatures: don't use wic images in test_hypervisor_fmts
There's no need to build a wic image in this test as not all machines (such as qemuarm64 currently) have wic images out of the box. We can simply build ext4 images to work on more machines and save some time. (From OE-Core rev: cdcf858d00eaf54814e23f550f83f3646bf83a24) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/cases/imagefeatures.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py b/meta/lib/oeqa/selftest/cases/imagefeatures.py
index f259ebb804..df796eaed0 100644
--- a/meta/lib/oeqa/selftest/cases/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py
@@ -136,7 +136,7 @@ class ImageFeatures(OESelftestTestCase):
136 img_types = [ 'vmdk', 'vdi', 'qcow2' ] 136 img_types = [ 'vmdk', 'vdi', 'qcow2' ]
137 features = "" 137 features = ""
138 for itype in img_types: 138 for itype in img_types:
139 features += 'IMAGE_FSTYPES += "wic.%s"\n' % itype 139 features += 'IMAGE_FSTYPES += "ext4.%s"\n' % itype
140 self.write_config(features) 140 self.write_config(features)
141 141
142 image_name = 'core-image-minimal' 142 image_name = 'core-image-minimal'
@@ -145,7 +145,7 @@ class ImageFeatures(OESelftestTestCase):
145 deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE') 145 deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE')
146 link_name = get_bb_var('IMAGE_LINK_NAME', image_name) 146 link_name = get_bb_var('IMAGE_LINK_NAME', image_name)
147 for itype in img_types: 147 for itype in img_types:
148 image_path = os.path.join(deploy_dir_image, "%s.wic.%s" % 148 image_path = os.path.join(deploy_dir_image, "%s.ext4.%s" %
149 (link_name, itype)) 149 (link_name, itype))
150 150
151 # check if result image file is in deploy directory 151 # check if result image file is in deploy directory