diff options
Diffstat (limited to 'scripts/check-qemu-install')
| -rwxr-xr-x | scripts/check-qemu-install | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index 76540c73..87a34afd 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -118,8 +118,11 @@ def get_qemu_cmd(name, enable_kvm, enable_uefi, disk_img, iso_img=None): cpu = "" uefi = "" + uuid = "f48b60b2-e6ad-49ef-9d09-4245d0585e52" if enable_uefi: uefi = "-bios /usr/share/OVMF/OVMF_CODE.fd" + name = f"{name}-UEFI" + uuid = "d27cf29e-4419-4407-8f82-dc73d1acd184" cdrom = "" if iso_img: @@ -143,6 +146,7 @@ def get_qemu_cmd(name, enable_kvm, enable_uefi, disk_img, iso_img=None): -netdev user,id=n6 -device virtio-net-pci,netdev=n6,mac={macbase}:06 \ -netdev user,id=n7 -device virtio-net-pci,netdev=n7,mac={macbase}:07 \ -machine accel=kvm \ + -uuid {uuid} \ -nographic {cpu} {cdrom} {kvm} \ -drive format=raw,file={disk_img}' @@ -199,6 +203,7 @@ if not os.path.isfile(args.disk): else: log.info('Diskimage already exists, using the existing one') +test_timeout = 7200 # seconds try: ################################################# # Installing image to disk @@ -352,7 +357,7 @@ try: log.info('Executing VyOS smoketests') c.sendline('/usr/bin/vyos-smoketest') i = c.expect(['\n +Invalid command:', '\n +Set failed', - 'No such file or directory', r'\n\S+@\S+[$#]'], timeout=7200) + 'No such file or directory', r'\n\S+@\S+[$#]'], timeout=test_timeout) if i == 0: raise Exception('Invalid command detected') @@ -415,7 +420,7 @@ try: log.info('Executing load config tests') c.sendline('/usr/bin/vyos-configtest') i = c.expect(['\n +Invalid command:', 'No such file or directory', - r'\n\S+@\S+[$#]'], timeout=3600) + r'\n\S+@\S+[$#]'], timeout=test_timeout) if i==0: raise Exception('Invalid command detected') |