AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Simplify downloading kernel for crosvm

Browse Source 
Directly download the kernel instead of using the
download-prebuilt-kernel.sh script.
Save the kernel to /kernel for clarity, replacing the previous
/lava-files directory.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33606>
This commit is contained in:
Valentine Burley
2025-02-18 16:06:53 +01:00
committed by Marge Bot
parent d979cd8d9d
commit 5b65bbf72c
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci/common/init-stage2.sh
View File

@@ -92,9 +92,9 @@ if [ "$HWCI_KVM" = "true" ]; then
} || \ } || \
modprobe ${KVM_KERNEL_MODULE} modprobe ${KVM_KERNEL_MODULE}
mkdir -p /lava-files mkdir -p /kernel
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \ curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-o "/lava-files/${KERNEL_IMAGE_NAME}" \ -o "/kernel/${KERNEL_IMAGE_NAME}" \
"${KERNEL_IMAGE_BASE}/amd64/${KERNEL_IMAGE_NAME}" "${KERNEL_IMAGE_BASE}/amd64/${KERNEL_IMAGE_NAME}"
fi fi

8
.gitlab-ci/container/debian/test-base.sh
View File

@@ -169,10 +169,12 @@ section_end debian_setup
############### Download prebuilt kernel ############### Download prebuilt kernel
if [ "$DEBIAN_ARCH" = amd64 ]; then if [ "$DEBIAN_ARCH" = amd64 ]; then
uncollapsed_section_start kernel "Downloading kernel" uncollapsed_section_start kernel "Downloading kernel for crosvm"
export KERNEL_IMAGE_NAME=bzImage export KERNEL_IMAGE_NAME=bzImage
mkdir -p /lava-files/ mkdir -p /kernel
. .gitlab-ci/container/download-prebuilt-kernel.sh # shellcheck disable=SC2153 # KERNEL_IMAGE_BASE is set in the root .gitlab-ci.yml file
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-o "/kernel/${KERNEL_IMAGE_NAME}" "${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/${KERNEL_IMAGE_NAME}"
section_end kernel section_end kernel
fi fi

2
.gitlab-ci/crosvm-runner.sh
View File

@@ -124,7 +124,7 @@ crosvm --no-syslog run \
--net "host-ip=192.168.30.1,netmask=255.255.255.0,mac=AA:BB:CC:00:00:12" \ --net "host-ip=192.168.30.1,netmask=255.255.255.0,mac=AA:BB:CC:00:00:12" \
-s $VM_SOCKET \ -s $VM_SOCKET \
--cid ${VSOCK_CID} -p "${CROSVM_KERN_ARGS}" \ --cid ${VSOCK_CID} -p "${CROSVM_KERN_ARGS}" \
/lava-files/${KERNEL_IMAGE_NAME:-bzImage} > ${VM_TEMP_DIR}/crosvm 2>&1 /kernel/${KERNEL_IMAGE_NAME:-bzImage} > ${VM_TEMP_DIR}/crosvm 2>&1
CROSVM_RET=$? CROSVM_RET=$?

2
.gitlab-ci/image-tags.yml
View File

@@ -13,7 +13,7 @@
variables: variables:
DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
DEBIAN_BASE_TAG: "20250219-virglcrosvm" DEBIAN_BASE_TAG: "20250220-kernel"
DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
DEBIAN_BUILD_TAG: "20250210-android-drm" DEBIAN_BUILD_TAG: "20250210-android-drm"