T8065: Dehardcode qemu settings to allow run tests on arch arm64

Author: sever-sever

Makefile

@@ -2,6 +2,8 @@ SHELL := /bin/bash
 
 build_dir := build
 
+arch ?= $(shell dpkg --print-architecture 2>/dev/null || echo amd64)
+
 .PHONY: all
 all:
 	@echo "Make what specifically?"
@@ -13,8 +15,8 @@ all:
 .PHONY: checkiso
 .ONESHELL:
 checkiso:
-	if [ ! -f build/live-image-amd64.hybrid.iso ]; then
-		echo "Could not find build/live-image-amd64.hybrid.iso"
+	if [ ! -f build/live-image-$(arch).hybrid.iso ]; then
+		echo "Could not find build/live-image-$(arch).hybrid.iso"
 		exit 1
 	fi
 
@@ -31,7 +33,7 @@ test-no-interfaces: checkiso
 .PHONY: test-no-interfaces-no-vpp
 .ONESHELL:
 test-no-interfaces-no-vpp: checkiso
-	scripts/check-qemu-install --debug --configd --smoketest --uefi --no-interfaces --no-vpp build/live-image-amd64.hybrid.iso
+	scripts/check-qemu-install --debug --configd --smoketest --uefi --no-interfaces --no-vpp --arch $(arch) build/live-image-$(arch).hybrid.iso
 
 .PHONY: test-interfaces
 .ONESHELL:

scripts/check-qemu-install

@@ -54,6 +54,22 @@ now = datetime.now()
 tpm_folder = '/tmp/vyos_tpm_test'
 qemu_name = 'VyOS-QEMU'
 
+# Map arch to QEMU binary and machine type
+QEMU_BIN = {
+    "amd64": "qemu-system-x86_64",
+    "arm64": "qemu-system-aarch64",
+}
+
+MACHINE_TYPE = {
+    "amd64": "pc",
+    "arm64": "virt",
+}
+
+BIOS = {
+    "amd64": "/usr/share/OVMF/OVMF_CODE.fd",
+    "arm64": "/usr/share/qemu-efi-aarch64/QEMU_EFI.fd",
+}
+
 # getch.py
 KEY_F2 = chr(27) + chr(91) + chr(49) + chr(50) + chr(126)
 KEY_F10 = chr(27) + chr(91) + chr(50) + chr(49) + chr(126)
@@ -103,6 +119,7 @@ parser.add_argument('--no-vpp', help='Execute testsuite without VPP tests',
                 action='store_true', default=False)
 parser.add_argument('--huge-page-size', help='Huge page size (e.g., 2M, 1G)', type=str)
 parser.add_argument('--huge-page-count', help='Number of huge pages to allocate', type=int)
+parser.add_argument('--arch', help='Architecture')
 
 args = parser.parse_args()
 
@@ -148,15 +165,18 @@ if args.sbtest:
 def get_qemu_cmd(name, enable_uefi, disk_img, raid=None, iso_img=None, tpm=False, vnc_enabled=False, secure_boot=False):
     uefi = ""
     uuid = "f48b60b2-e6ad-49ef-9d09-4245d0585e52"
-    machine = 'pc'
+    arch = getattr(args, 'arch', 'amd64')
+    qemu_bin = QEMU_BIN.get(arch, 'qemu-system-x86_64')
+    machine = MACHINE_TYPE.get(arch, 'pc')
+    bios_file = BIOS.get(arch, None)
     vga = '-vga none'
     vnc = ''
     if vnc_enabled:
         vga = '-vga virtio'
         vnc = '-vnc :0'
 
     if enable_uefi:
-        uefi = '-bios /usr/share/OVMF/OVMF_CODE.fd'
+        uefi = f'-bios {bios_file}'
         name = f'{name}-UEFI'
 
         if secure_boot:
@@ -176,7 +196,7 @@ def get_qemu_cmd(name, enable_uefi, disk_img, raid=None, iso_img=None, tpm=False
 
     # RFC7042 section 2.1.2 MAC addresses used for documentation
     macbase = '00:00:5E:00:53'
-    cmd = f'qemu-system-x86_64 \
+    cmd = f'{qemu_bin} \
         -name "{name}" \
         -smp {args.cpu},sockets=1,cores={args.cpu},threads=1 \
         -cpu host \