From 0659d79d19ff81f7e3c3bbbb11be7793937c4811 Mon Sep 17 00:00:00 2001 From: Leonid Kondrashov Date: Mon, 15 Jul 2024 18:27:50 +0800 Subject: [PATCH] Fix firecracker image download Signed-off-by: Leonid Kondrashov --- bin/.gitattributes | 1 + bin/vmlinux-5.10.186 | 3 +++ scripts/setup/setup.go | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 bin/vmlinux-5.10.186 diff --git a/bin/.gitattributes b/bin/.gitattributes index 4e8238018..27e546451 100644 --- a/bin/.gitattributes +++ b/bin/.gitattributes @@ -7,3 +7,4 @@ default-rootfs.img filter=lfs diff=lfs merge=lfs -text grpcurl filter=lfs diff=lfs merge=lfs -text containerd-shim-runsc-v1 filter=lfs diff=lfs merge=lfs -text gvisor-containerd filter=lfs diff=lfs merge=lfs -text +vmlinux-5.10.186 filter=lfs diff=lfs merge=lfs -text diff --git a/bin/vmlinux-5.10.186 b/bin/vmlinux-5.10.186 new file mode 100644 index 000000000..3e8d8c83e --- /dev/null +++ b/bin/vmlinux-5.10.186 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d63474d9d2be88c901e0c3a60e81667e743f0d2370b4ae83e038f23299d2df40 +size 45608448 diff --git a/scripts/setup/setup.go b/scripts/setup/setup.go index 3a075517c..96d1c1f14 100644 --- a/scripts/setup/setup.go +++ b/scripts/setup/setup.go @@ -83,8 +83,8 @@ func SetupFirecrackerContainerd() error { return err } - // kernel image - kernelImgPath, err := utils.DownloadToTmpDir(configs.VHive.FirecrackerKernelImgDownloadUrl) + // kernel image; better to download it from AWS S3 but it takes too much time on NTU network + kernelImgPath, err := utils.GetVHiveFilePath(path.Join(binsDir, "vmlinux-5.10.186")) if !utils.CheckErrorWithMsg(err, "Failed to download kernel image!\n") { return err }