kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts: use arch OVMF downloads and bump fw tag

Browse Source 
Rename download_ovmf to download_amd64_ovmf and add a separate
download_aarch64_ovmf for CLOUDHV_EFI.fd

Replace build_edk2 with download_aarch64_ovmf in aarch64 scripts

Update OVMF firmware tag to ch-1e1b96f126

Update CLOUDHV.fd sha1sum in sha1sums-x86_64

Add CLOUDHV_EFI.fd sha1sum in sha1sums-aarch64-common

Fixes: #7622

Signed-off-by: Saravanan D <saravanand@crusoe.ai>
This commit is contained in:
Saravanan D
2026-04-07 06:49:28 +00:00
committed by Rob Bradford
parent 490e338e16
commit 2ddbc5abbb
7 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/run_integration_tests_aarch64.sh
View File

@@ -136,6 +136,9 @@ update_workloads() {
popd || exit popd || exit
fi fi
# Download aarch64 ovmf
download_aarch64_ovmf
pushd "$WORKLOADS_DIR" || exit pushd "$WORKLOADS_DIR" || exit
if ! sha1sum sha1sums-aarch64-common --check; then if ! sha1sum sha1sums-aarch64-common --check; then
@@ -202,9 +205,6 @@ update_workloads() {
echo "foo" >"$SHARED_DIR/file1" echo "foo" >"$SHARED_DIR/file1"
echo "bar" >"$SHARED_DIR/file3" || exit 1 echo "bar" >"$SHARED_DIR/file3" || exit 1
fi fi
# Checkout and build EDK2
build_edk2
} }
process_common_args "$@" process_common_args "$@"

4
scripts/run_integration_tests_windows_aarch64.sh
View File

@@ -18,9 +18,9 @@ fi
WIN_IMAGE_BASENAME="windows-11-iot-enterprise-aarch64.raw" WIN_IMAGE_BASENAME="windows-11-iot-enterprise-aarch64.raw"
WIN_IMAGE_FILE="$WORKLOADS_DIR/$WIN_IMAGE_BASENAME" WIN_IMAGE_FILE="$WORKLOADS_DIR/$WIN_IMAGE_BASENAME"
# Checkout and build EDK2 # Download aarch64 OVMF
OVMF_FW="$WORKLOADS_DIR/CLOUDHV_EFI.fd" OVMF_FW="$WORKLOADS_DIR/CLOUDHV_EFI.fd"
build_edk2 download_aarch64_ovmf
# Check if the images are present # Check if the images are present
if [[ ! -f ${WIN_IMAGE_FILE} || ! -f ${OVMF_FW} ]]; then if [[ ! -f ${WIN_IMAGE_FILE} || ! -f ${OVMF_FW} ]]; then

3
scripts/run_integration_tests_windows_x86_64.sh
View File

@@ -17,7 +17,8 @@ WIN_IMAGE_FILE="/root/workloads/windows-server-2022-amd64-2.raw"
WORKLOADS_DIR="/root/workloads" WORKLOADS_DIR="/root/workloads"
download_ovmf # Download amd64 ovmf
download_amd64_ovmf
CFLAGS="" CFLAGS=""
if [[ "${BUILD_TARGET}" == "x86_64-unknown-linux-musl" ]]; then if [[ "${BUILD_TARGET}" == "x86_64-unknown-linux-musl" ]]; then

2
scripts/run_integration_tests_x86_64.sh
View File

@@ -25,7 +25,7 @@ if [ ! -f "$WORKLOADS_DIR/hypervisor-fw" ]; then
fi fi
if [ ! -f "$WORKLOADS_DIR/CLOUDHV.fd" ]; then if [ ! -f "$WORKLOADS_DIR/CLOUDHV.fd" ]; then
download_ovmf download_amd64_ovmf
fi fi
download_x86_guest_images download_x86_guest_images

1
scripts/sha1sums-aarch64-common
View File

@@ -3,3 +3,4 @@ e4addb6e212a298144f9eb0eb6e36019d013f0e7 alpine-minirootfs-aarch64.tar.gz
9953b31bb1923cdd8d91b1b7cc9ad3a9be1e0a59 focal-server-cloudimg-arm64-custom-20210929-0.raw 9953b31bb1923cdd8d91b1b7cc9ad3a9be1e0a59 focal-server-cloudimg-arm64-custom-20210929-0.raw
7118f4d4cad18c8357bc2ad9824a50f9a82a860a jammy-server-cloudimg-arm64-custom-20220329-0.qcow2 7118f4d4cad18c8357bc2ad9824a50f9a82a860a jammy-server-cloudimg-arm64-custom-20220329-0.qcow2
1f2b71be43b8f748f01306c4454e5c921343faa4 jammy-server-cloudimg-arm64-custom-20220329-0.raw 1f2b71be43b8f748f01306c4454e5c921343faa4 jammy-server-cloudimg-arm64-custom-20220329-0.raw
ce3656987f9e4238ef8afbd65fca219460c1f767 CLOUDHV_EFI.fd

2
scripts/sha1sums-x86_64
View File

@@ -1,3 +1,3 @@
d4a44acc6014d5f83dea1c625c43d677a95fa75f alpine-minirootfs-x86_64.tar.gz d4a44acc6014d5f83dea1c625c43d677a95fa75f alpine-minirootfs-x86_64.tar.gz
540ac358429305d7aa94e15363665d1c9d845982 hypervisor-fw 540ac358429305d7aa94e15363665d1c9d845982 hypervisor-fw
cf89e3e052c8ef0b6192abee6128eef943393307 CLOUDHV.fd fb2e6834cc482c80a45766f6dcf12474f4fcb74e CLOUDHV.fd

14
scripts/test-util.sh
View File

@@ -198,8 +198,8 @@ prepare_linux() {
fi fi
} }
download_ovmf() { download_amd64_ovmf() {
OVMF_FW_TAG="ch-13b4963ec4" OVMF_FW_TAG="ch-1e1b96f126"
OVMF_FW_URL="https://github.com/cloud-hypervisor/edk2/releases/download/$OVMF_FW_TAG/CLOUDHV.fd" OVMF_FW_URL="https://github.com/cloud-hypervisor/edk2/releases/download/$OVMF_FW_TAG/CLOUDHV.fd"
OVMF_FW="$WORKLOADS_DIR/CLOUDHV.fd" OVMF_FW="$WORKLOADS_DIR/CLOUDHV.fd"
pushd "$WORKLOADS_DIR" || exit pushd "$WORKLOADS_DIR" || exit
@@ -208,6 +208,16 @@ download_ovmf() {
popd || exit popd || exit
} }
download_aarch64_ovmf() {
OVMF_FW_TAG="ch-1e1b96f126"
OVMF_FW_URL="https://github.com/cloud-hypervisor/edk2/releases/download/$OVMF_FW_TAG/CLOUDHV_EFI.fd"
OVMF_FW="$WORKLOADS_DIR/CLOUDHV_EFI.fd"
pushd "$WORKLOADS_DIR" || exit
rm -f "$OVMF_FW"
download_with_retries $OVMF_FW_URL || exit 1
popd || exit
}
# Function to mount image partition, execute commands, and cleanup. # Function to mount image partition, execute commands, and cleanup.
# Arguments: $1: Image file path, $2: Mount directory, $3+: Commands to execute. # Arguments: $1: Image file path, $2: Mount directory, $3+: Commands to execute.
mount_and_exec() { mount_and_exec() {