summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLaurent Bonnans <laurent.bonnans@here.com>2019-07-15 15:37:43 +0200
committerLaurent Bonnans <laurent.bonnans@here.com>2019-07-16 16:25:55 +0200
commit773276aa943390e73694385169207636e6caf036 (patch)
treef79d68e27cc920ca069e6ca7f4819bbc3c2b0743 /lib
parentbdbc87e0ac6316d86a066ae7eecf27267a204e12 (diff)
downloadmeta-updater-773276aa943390e73694385169207636e6caf036.tar.gz
Use 128M by default for qemu in oe-selftests
Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/oeqa/selftest/cases/testutils.py1
-rw-r--r--lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py3
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/oeqa/selftest/cases/testutils.py b/lib/oeqa/selftest/cases/testutils.py
index 208f822..8d618a6 100644
--- a/lib/oeqa/selftest/cases/testutils.py
+++ b/lib/oeqa/selftest/cases/testutils.py
@@ -34,6 +34,7 @@ def qemu_boot_image(imagename, **kwargs):
34 args.dir = 'tmp/deploy/images' 34 args.dir = 'tmp/deploy/images'
35 args.efi = kwargs.get('efi', False) 35 args.efi = kwargs.get('efi', False)
36 args.machine = kwargs.get('machine', None) 36 args.machine = kwargs.get('machine', None)
37 args.mem = kwargs.get('mem', '128M')
37 qemu_use_kvm = get_bb_var("QEMU_USE_KVM") 38 qemu_use_kvm = get_bb_var("QEMU_USE_KVM")
38 if qemu_use_kvm and \ 39 if qemu_use_kvm and \
39 (qemu_use_kvm == 'True' and 'x86' in args.machine or 40 (qemu_use_kvm == 'True' and 'x86' in args.machine or
diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py
index 83f5841..e9a1a65 100644
--- a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py
+++ b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py
@@ -1,5 +1,4 @@
1# pylint: disable=C0111,C0325 1# pylint: disable=C0111,C0325
2import os
3import re 2import re
4 3
5from oeqa.selftest.case import OESelftestTestCase 4from oeqa.selftest.case import OESelftestTestCase
@@ -22,7 +21,7 @@ class PtestTests(OESelftestTestCase):
22 self.append_config('PTEST_ENABLED_pn-aktualizr = "1"') 21 self.append_config('PTEST_ENABLED_pn-aktualizr = "1"')
23 self.append_config('IMAGE_INSTALL_append += "aktualizr-ptest ptest-runner "') 22 self.append_config('IMAGE_INSTALL_append += "aktualizr-ptest ptest-runner "')
24 self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"') 23 self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
25 self.qemu, self.s = qemu_launch(machine='qemux86-64') 24 self.qemu, self.s = qemu_launch(machine='qemux86-64', mem="256M")
26 25
27 def tearDownLocal(self): 26 def tearDownLocal(self):
28 qemu_terminate(self.s) 27 qemu_terminate(self.s)