Skip to content

Commit

Permalink
chore: update OS images (#318)
Browse files Browse the repository at this point in the history
Issue #, if available:
-
https://github.com/runfinch/finch/actions/runs/9083271563/job/24961618496?pr=895
    - macOS VZ launch failing on macOS 13 ARM runner

*Description of changes:*
- The initial Fedora 40 images used the UKI (unified kernel image) cloud
image as a base. UKI apparently doesn't work with VZ on older versions
of macOS. Switched to use the "Generic" base image

*Testing done:*
- Tested locally

- [x] I've reviewed the guidance in CONTRIBUTING.md


#### License Acceptance

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.

Signed-off-by: Justin Alvarez <[email protected]>
  • Loading branch information
pendo324 authored May 15, 2024
1 parent 80e819d commit 21fdb6f
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ BUILD_TS := $(shell date +%s)

# Set these variables if they aren't set, or if they are set to ""
# Allows callers to override these default values
# From https://dl.fedoraproject.org/pub/fedora/linux/releases/37/Cloud/x86_64/images/
FINCH_OS_x86_URL := $(or $(FINCH_OS_x86_URL),https://deps.runfinch.com/Fedora-Cloud-Base-40-1.14.x86_64-20240503185933.qcow2)
FINCH_OS_x86_DIGEST := $(or $(FINCH_OS_x86_DIGEST),"sha256:bf54037097a69c13e5b0eb3fae1b23517d76028f790786b7b76d43bea1395298")
# From https://dl.fedoraproject.org/pub/fedora/linux/releases/37/Cloud/aarch64/images/
FINCH_OS_AARCH64_URL := $(or $(FINCH_OS_AARCH64_URL),https://deps.runfinch.com/Fedora-Cloud-Base-40-1.14.aarch64-20240503185927.qcow2)
FINCH_OS_AARCH64_DIGEST := $(or $(FINCH_OS_AARCH64_DIGEST),"sha256:787c2b3e24774e45fea9fc9bef628d4a309b0893a4d452d064b52785efda002d")

FINCH_ROOTFS_x86_URL := $(or $(FINCH_ROOTFS_x86_URL),https://deps.runfinch.com/common/x86-64/finch-rootfs-production-amd64-1714767486.tar.gz)
FINCH_ROOTFS_x86_DIGEST := $(or $(FINCH_ROOTFS_x86_DIGEST),"sha256:6b70063b0522c341f957e9b2ef9eea4dbf6ab2c93879661e70bdd61cd952c41a")
# From https://dl.fedoraproject.org/pub/fedora/linux/releases/40/Cloud/x86_64/images/
FINCH_OS_x86_URL := $(or $(FINCH_OS_x86_URL),https://deps.runfinch.com/Fedora-Cloud-Base-40-1.14.x86_64-20240514214655.qcow2)
FINCH_OS_x86_DIGEST := $(or $(FINCH_OS_x86_DIGEST),"sha256:a7d5203d353ea6f5b4de73fdb0f36fe4f58b844c8d401f57015430f553a873c4")
# From https://dl.fedoraproject.org/pub/fedora/linux/releases/40/Cloud/aarch64/images/
FINCH_OS_AARCH64_URL := $(or $(FINCH_OS_AARCH64_URL),https://deps.runfinch.com/Fedora-Cloud-Base-40-1.14.aarch64-20240514214641.qcow2)
FINCH_OS_AARCH64_DIGEST := $(or $(FINCH_OS_AARCH64_DIGEST),"sha256:16268745d1f401cc543cb89bf354c49f8bc3d00ce723d59aa289d21b9c872b60")

FINCH_ROOTFS_x86_URL := $(or $(FINCH_ROOTFS_x86_URL),https://deps.runfinch.com/common/x86-64/finch-rootfs-production-amd64-1715724303.tar.gz)
FINCH_ROOTFS_x86_DIGEST := $(or $(FINCH_ROOTFS_x86_DIGEST),"sha256:8bf3e620782ac8991102120b80c0d1be259cd880451c900dd7e8bd284c86f171")

LIMA_DEPENDENCY_FILE_NAME ?= lima-and-qemu.tar.gz
.DEFAULT_GOAL := all
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Fedora-Cloud-Base-40-1.14.aarch64-20240514214641.qcow2
9574dbbee1e34c005334fada0e29a6598cdbc3312b7b54214f20cc36549e48aa34f197a93d3fa9e83208db6d7e32ce6e04bb620048ac2c5620ce86690067f986 *Fedora-Cloud-Base-40-1.14.aarch64-20240514214641.qcow2

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Fedora-Cloud-Base-40-1.14.x86_64-20240514214655.qcow2
0a4894f10b5b8c4096c8bb7bdcbd23d59f4f5c6ceed228101f7ff3ea0a2e017d7e669b2e794628d52523e599a4028d7f6bd665b37336c0607e605dac4701d5b1 *Fedora-Cloud-Base-40-1.14.x86_64-20240514214655.qcow2

0 comments on commit 21fdb6f

Please sign in to comment.