[PATCH v3 7/7] run vm_boot_test against EFI and PC BIOS

[Felix Moessbauer <felix.moessbauer@siemens.com>]

This patch adds a test that boots the combined efi + pcbios
image with pc bios.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 testsuite/cibuilder.py | 4 ++--
 testsuite/citest.py    | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py
index 069a1d93..71e0c1c2 100755
--- a/testsuite/cibuilder.py
+++ b/testsuite/cibuilder.py
@@ -189,7 +189,7 @@ class CIBuilder(Test):
 
         return env['LAYERDIR_' + layer].strip('"')
 
-    def vm_start(self, arch='amd64', distro='buster'):
+    def vm_start(self, arch='amd64', distro='buster', enforce_pcbios=False):
         time_to_wait = self.params.get('time_to_wait', default=60)
 
         self.log.info('===================================================')
@@ -213,7 +213,7 @@ class CIBuilder(Test):
         os.symlink(os.path.basename(output_file), latest_link)
 
         cmdline = start_vm.format_qemu_cmdline(arch, self.build_dir, distro,
-                                               output_file, None)
+                                               output_file, None, enforce_pcbios)
         cmdline.insert(1, '-nographic')
 
         self.log.info('QEMU boot line: ' + str(cmdline))
diff --git a/testsuite/citest.py b/testsuite/citest.py
index 1138eb2b..ace1c039 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -304,7 +304,10 @@ class VmBootTestFull(CIBaseTest):
 
     def test_amd64_buster(self):
         self.init()
+        # test efi boot
         self.vm_start('amd64','buster')
+        # test pcbios boot
+        self.vm_start('amd64', 'buster', True)
 
     def test_amd64_focal(self):
         self.init()
-- 
2.30.2