From d7999acdfe021da208e66a8c0a8442adf747ba2f Mon Sep 17 00:00:00 2001 From: Akira Moroo Date: Tue, 12 Dec 2023 19:13:56 +0900 Subject: [PATCH] Revert "scripts: Use older jammy image" This reverts commit 7cb13a521e918cb6716f87bde490a1a458284f0c. --- scripts/fetch_images.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/fetch_images.sh b/scripts/fetch_images.sh index 72bb5de6..ee9a7af7 100755 --- a/scripts/fetch_images.sh +++ b/scripts/fetch_images.sh @@ -37,18 +37,17 @@ convert_image() { fetch_raw_ubuntu_image() { OS_NAME="$1" OS_ARCH="$2" - OS_DATE="$3" OS_IMAGE_NAME="$OS_NAME-server-cloudimg-$OS_ARCH.img" OS_RAW_IMAGE_NAME="$OS_NAME-server-cloudimg-$OS_ARCH-raw.img" OS_IMAGE_BASE="https://cloud-images.ubuntu.com" - OS_IMAGE_URL="$OS_IMAGE_BASE/$OS_NAME/$OS_DATE/$OS_IMAGE_NAME" + OS_IMAGE_URL="$OS_IMAGE_BASE/$OS_NAME/current/$OS_IMAGE_NAME" fetch_image "$OS_IMAGE_NAME" "$OS_IMAGE_URL" convert_image "$OS_IMAGE_NAME" "$OS_RAW_IMAGE_NAME" } aarch64_fetch_disk_images() { - fetch_raw_ubuntu_image "focal" "arm64" "current" - fetch_raw_ubuntu_image "jammy" "arm64" "20231026" + fetch_raw_ubuntu_image "focal" "arm64" + fetch_raw_ubuntu_image "jammy" "arm64" } x86_64_fetch_disk_images() { @@ -57,8 +56,8 @@ x86_64_fetch_disk_images() { CLEAR_OS_IMAGE_URL="$CLEAR_OS_URL_BASE/$CLEAR_OS_IMAGE_NAME" fetch_image "$CLEAR_OS_IMAGE_NAME" "$CLEAR_OS_IMAGE_URL" - fetch_raw_ubuntu_image "focal" "amd64" "current" - fetch_raw_ubuntu_image "jammy" "amd64" "20231026" + fetch_raw_ubuntu_image "focal" "amd64" + fetch_raw_ubuntu_image "jammy" "amd64" } fetch_disk_images() {