Riscv: Bump Ubuntu version to 23.10
Test: QEMU boots
Change-Id: I397f9d82a09fbcc8d7e40f23dc1cec1fc48738d4
diff --git a/tools/buildbot-utils.sh b/tools/buildbot-utils.sh
index 70fa01a..1cdd275 100755
--- a/tools/buildbot-utils.sh
+++ b/tools/buildbot-utils.sh
@@ -87,7 +87,7 @@
export RSYNC_RSH="ssh -i ~/.ssh/ubuntu -p $ART_TEST_SSH_PORT -o StrictHostKeyChecking=no" # don't prefix with "ART_", rsync expects this name
if [[ "$TARGET_ARCH" =~ ^(arm64|riscv64)$ ]]; then
- export ART_TEST_VM_IMG="ubuntu-22.04-server-cloudimg-$TARGET_ARCH.img"
+ export ART_TEST_VM_IMG="ubuntu-23.10-server-cloudimg-$TARGET_ARCH.img"
export ART_TEST_VM_DIR="$ANDROID_BUILD_TOP/vm/$TARGET_ARCH"
export ART_TEST_VM="$ART_TEST_VM_DIR/$ART_TEST_VM_IMG"
else
diff --git a/tools/buildbot-vm.sh b/tools/buildbot-vm.sh
index 6c324c3..fef2967 100755
--- a/tools/buildbot-vm.sh
+++ b/tools/buildbot-vm.sh
@@ -45,18 +45,18 @@
# sudo apt install qemu-system-<arch> qemu-efi cloud-image-utils
- # Get the cloud image for Ubunty 22.04 (Jammy)
- wget "http://cloud-images.ubuntu.com/releases/22.04/release/$ART_TEST_VM_IMG"
+ # Get the cloud image for Ubunty 23.10 (Mantic Minotaur)
+ wget "http://cloud-images.ubuntu.com/releases/23.10/release/$ART_TEST_VM_IMG"
if [[ "$TARGET_ARCH" = "riscv64" ]]; then
# Get U-Boot for Ubuntu 22.04 (Jammy)
get_stable_binary \
- u/u-boot/u-boot-qemu_2022.01+dfsg-2ubuntu2.3_all.deb \
+ u/u-boot/u-boot-qemu_2023.07+dfsg-1ubuntu2_all.deb \
usr/lib/u-boot/qemu-riscv64_smode/uboot.elf
# Get OpenSBI for Ubuntu 22.04 (Jammy)
get_stable_binary \
- o/opensbi/opensbi_1.3-1ubuntu0.22.04.2_all.deb \
+ o/opensbi/opensbi_1.3-1ubuntu0.23.04.2_all.deb \
usr/lib/riscv64-linux-gnu/opensbi/generic/fw_jump.elf
elif [[ "$TARGET_ARCH" = "arm64" ]]; then