diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-12-16 20:30:16 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-12-25 22:07:01 +0100 |
| commit | 8433218c328a9d1a00c71e48e7abe21da22ba9a1 (patch) | |
| tree | ba59412a27f92414b94798af14aad4037af1fa0b | |
| parent | 5e2d0fba80221f4adae38c73aadd65b68cef197c (diff) | |
| download | vyos-build-8433218c328a9d1a00c71e48e7abe21da22ba9a1.tar.gz vyos-build-8433218c328a9d1a00c71e48e7abe21da22ba9a1.zip | |
Testsuite: add 8th NIC and disable PXE boot
(cherry picked from commit e836f7245837618c00f563af4ae0836ab81b5686)
| -rwxr-xr-x | scripts/check-qemu-install | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index e1d956f5..54fcd6d8 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -52,15 +52,13 @@ now = datetime.now() parser = argparse.ArgumentParser(description='Install and start a test VyOS vm.') parser.add_argument('iso', help='ISO file to install') -parser.add_argument('disk', help='name of disk image file', - nargs='?', +parser.add_argument('disk', help='name of disk image file', nargs='?', default='testinstall-{}-{}.img'.format(now.strftime('%Y%m%d-%H%M%S'), "%04x" % random.randint(0,65535))) parser.add_argument('--keep', help='Do not remove disk-image after installation', action='store_true', default=False) parser.add_argument('--silent', help='Do not show output on stdout unless an error has occured', - action='store_true', - default=False) + action='store_true', default=False) parser.add_argument('--debug', help='Send all debug output to stdout', action='store_true', default=False) parser.add_argument('--logfile', help='Log to file') @@ -129,14 +127,19 @@ def get_qemu_cmd(name, enable_kvm, enable_uefi, disk_img, raid=None, iso_img=Non macbase = '52:54:00:00:00' cmd = f'qemu-system-x86_64 \ -name "{name}" \ - -smp {cpucount} \ + -smp sockets=1,cpus={cpucount},cores=1 \ + -cpu host \ {uefi} \ -m 1G \ -vga none \ - -netdev user,id=n1 -device virtio-net-pci,netdev=n1,mac={macbase}:01 \ - -netdev user,id=n2 -device virtio-net-pci,netdev=n2,mac={macbase}:02 \ - -netdev user,id=n3 -device virtio-net-pci,netdev=n3,mac={macbase}:03 \ - -netdev user,id=n4 -device virtio-net-pci,netdev=n4,mac={macbase}:04 \ + -netdev user,id=n0 -device virtio-net-pci,netdev=n0,mac={macbase}:00,romfile="" \ + -netdev user,id=n1 -device virtio-net-pci,netdev=n1,mac={macbase}:01,romfile="" \ + -netdev user,id=n2 -device virtio-net-pci,netdev=n2,mac={macbase}:02,romfile="" \ + -netdev user,id=n3 -device virtio-net-pci,netdev=n3,mac={macbase}:03,romfile="" \ + -netdev user,id=n4 -device virtio-net-pci,netdev=n4,mac={macbase}:04,romfile="" \ + -netdev user,id=n5 -device virtio-net-pci,netdev=n5,mac={macbase}:05,romfile="" \ + -netdev user,id=n6 -device virtio-net-pci,netdev=n6,mac={macbase}:06,romfile="" \ + -netdev user,id=n7 -device virtio-net-pci,netdev=n7,mac={macbase}:07,romfile="" \ -machine accel=kvm \ -uuid {uuid} \ -nographic {cpu} {cdrom} {kvm} \ |