diff options
| -rwxr-xr-x | tools/buildbot-vm.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/buildbot-vm.sh b/tools/buildbot-vm.sh index 751461ee0b..a15f9e8cbe 100755 --- a/tools/buildbot-vm.sh +++ b/tools/buildbot-vm.sh @@ -60,9 +60,9 @@ if [[ $action = create ]]; then usr/lib/riscv64-linux-gnu/opensbi/generic/fw_jump.elf elif [[ "$TARGET_ARCH" = "arm64" ]]; then - # Get EFI (ARM64) for Ubuntu 22.04 (Jammy) + # Get EFI (ARM64) get_stable_binary \ - e/edk2/qemu-efi-aarch64_2022.02-3ubuntu0.22.04.1_all.deb \ + e/edk2/qemu-efi-aarch64_2023.05-2ubuntu0.1_all.deb \ usr/share/qemu-efi-aarch64/QEMU_EFI.fd dd if=/dev/zero of=flash0.img bs=1M count=64 @@ -135,7 +135,7 @@ elif [[ $action = boot ]]; then (qemu-system-aarch64 \ -m 16G \ -smp 8 \ - -cpu cortex-a57 \ + -cpu cortex-a710,sve=on \ -M virt \ -nographic \ -drive if=none,file="$ART_TEST_VM_IMG",id=hd0 \ @@ -146,9 +146,10 @@ elif [[ $action = boot ]]; then -device virtio-net-device,netdev=usernet \ -netdev user,id=usernet,hostfwd=tcp::$ART_TEST_SSH_PORT-:22 > $SCRIPT_DIR/boot.out &) echo "Now listening for successful boot" + finish_str='.*finished at.*' while IFS= read -d $'\0' -n 1 a ; do line+="${a}" - if [[ "$line" =~ '.*finished.*' ]] ; then + if [[ "$line" =~ $finish_str ]] ; then echo $line echo "VM Successfully booted!" exit 0 |