diff options
| -rw-r--r-- | data/defaults.json | 4 | ||||
| -rw-r--r-- | docker/Dockerfile | 3 | ||||
| -rwxr-xr-x | scripts/check-qemu-install | 15 |
3 files changed, 17 insertions, 5 deletions
diff --git a/data/defaults.json b/data/defaults.json index 792a20a2..1b7b5e0a 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -5,12 +5,12 @@ "debian_distribution": "bullseye", "vyos_mirror": "http://dev.packages.vyos.net/repositories/current", "vyos_branch": "current", - "kernel_version": "5.10.109", + "kernel_version": "5.10.112", "kernel_flavor": "amd64-vyos", "release_train": "sagitta", "bootloaders": "syslinux,grub-efi", "additional_repositories": [ - "deb [arch=amd64] https://repo.saltproject.io/py3/debian/10/amd64/3003 buster main", + "deb [arch=amd64] https://repo.saltproject.io/py3/debian/11/amd64/3004 bullseye main", "deb [arch=amd64] http://repo.powerdns.com/debian bullseye-rec-45 main", "deb [arch=amd64] https://repos.influxdata.com/debian bullseye stable" ], diff --git a/docker/Dockerfile b/docker/Dockerfile index 2b81d513..4536132d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -263,7 +263,7 @@ RUN export RTRLIB_VERSION="56e67e7805953eb84d3d68dfb4ff4447f2a8c925" \ dpkg -i ../librtr0*_${ARCH}.deb ../librtr-dev*_${ARCH}.deb ../rtr-tools*_${ARCH}.deb # Packages needed to build libyang2 -RUN pip3 install apkg +RUN pip install apkg RUN apt-get update && apt-get install -y \ graphviz \ cmake \ @@ -313,6 +313,7 @@ RUN apt-get update && apt-get install -y \ gprbuild # Packages needed for vyos-1x +RUN pip install git+https://github.com/aristanetworks/j2lint.git@341b5d5db86 RUN apt-get update && apt-get install -y \ dh-python \ fakeroot \ diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index aaac8250..96587ce5 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -72,6 +72,9 @@ parser.add_argument('--no-interfaces', help='Execute testsuite without interface action='store_true', default=False) parser.add_argument('--configtest', help='Execute load/commit config tests', action='store_true', default=False) +parser.add_argument('--qemu-cmd', help='Only generate QEMU launch command', + action='store_true', default=False) + args = parser.parse_args() @@ -143,7 +146,7 @@ def get_qemu_cmd(name, enable_kvm, enable_uefi, disk_img, raid=None, iso_img=Non -smp sockets=1,cpus={cpucount},cores=1 \ -cpu host \ {uefi} \ - -m 1G \ + -m 2G \ -vga none \ -nographic \ -machine accel=kvm \ @@ -151,7 +154,7 @@ def get_qemu_cmd(name, enable_kvm, enable_uefi, disk_img, raid=None, iso_img=Non {cpu} \ {cdrom} \ {kvm} \ - -netdev user,id=n0 -device virtio-net-pci,netdev=n0,mac={macbase}:00,romfile="" \ + -netdev user,id=n0,net=192.0.2.0/24,dhcpstart=192.0.2.101,dns=192.0.2.10 -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="" \ @@ -262,6 +265,11 @@ if args.raid: # must be called after the raid disk as args.disk name is altered in the RAID path gen_disk(args.disk) +if args.qemu_cmd: + tmp = get_qemu_cmd('TESTVM', kvm, args.uefi, args.disk, diskname_raid, args.iso) + print(tmp) + exit(0) + test_timeout = 3 *3600 # 3 hours (in seconds) try: ################################################# @@ -389,6 +397,9 @@ try: c.expect(op_mode_prompt) c.sendline('show interfaces') c.expect(op_mode_prompt) + c.sendline('systemd-detect-virt') + c.expect('kvm') + c.expect(op_mode_prompt) ################################################# # Executing test-suite |