From 0b3c91d2a23f31aabec923d2c5cd24d4e1d1e08c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Mon, 2 Jan 2023 09:52:41 +0100 Subject: [PATCH 1/4] kata-deploy: Add kernel-dragonball-experimental target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As Chao Wu added the support for building the dragonball kernel as a new experimental kernel, let's make sure we reflect that as part of the kata-deploy build scripts. Signed-off-by: Fabiano Fidêncio --- tools/packaging/kata-deploy/local-build/Makefile | 4 ++++ .../kata-deploy/local-build/kata-deploy-binaries.sh | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile index 078a679d85..de831e1fe7 100644 --- a/tools/packaging/kata-deploy/local-build/Makefile +++ b/tools/packaging/kata-deploy/local-build/Makefile @@ -24,6 +24,7 @@ all-parallel: $(MK_DIR)/dockerbuild/install_yq.sh all: serial-targets \ firecracker-tarball \ kernel-tarball \ + kernel-dragonball-experimental-tarball \ nydus-tarball \ qemu-tarball \ shim-v2-tarball \ @@ -47,6 +48,9 @@ firecracker-tarball: kernel-tarball: ${MAKE} $@-build +kernel-dragonball-experimental-tarball: + ${MAKE} $@-build + kernel-experimental-tarball: ${MAKE} $@-build diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh index 1e83e31537..a7143096c4 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -73,6 +73,7 @@ options: cloud-hypervisor firecracker kernel + kernel-dragonball-experimental kernel-experimental nydus qemu @@ -103,6 +104,13 @@ install_kernel() { DESTDIR="${destdir}" PREFIX="${prefix}" "${kernel_builder}" -f -v "${kernel_version}" } +#Install dragonball experimental kernel asset +install_dragonball_experimental_kernel() { + info "build dragonball experimental kernel" + export kernel_version="$(yq r $versions_yaml assets.dragonball-kernel-experimental.version)" + info "kernel version ${kernel_version}" + DESTDIR="${destdir}" PREFIX="${prefix}" "${kernel_builder}" -e -t dragonball -v ${kernel_version} +} #Install experimental kernel asset install_experimental_kernel() { @@ -204,6 +212,8 @@ handle_build() { nydus) install_nydus ;; + kernel-dragonball-experimental) install_dragonball_experimental_kernel;; + kernel-experimental) install_experimental_kernel;; qemu) install_qemu ;; From 063dec37c298ad16ee22c772a23020bef424f879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Mon, 2 Jan 2023 09:54:45 +0100 Subject: [PATCH 2/4] release: Add the dragonball-experimental kernel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's add the dragonball specific kernel, which takes advantage of upcall, as part of the release tarball, so it can be used from the release tarball / kata-deploy. Signed-off-by: Fabiano Fidêncio --- .github/workflows/release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b5f585937e..bbb95c53da 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -13,6 +13,7 @@ jobs: - cloud-hypervisor - firecracker - kernel + - kernel-dragonball-experimental - nydus - qemu - rootfs-image From b7f4e96ff39941dd97130e1b6f0166b830e8f655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Mon, 2 Jan 2023 09:56:19 +0100 Subject: [PATCH 3/4] kata-deploy-test: Ensure we build dragonball specific kernel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As the dragonball specific kernel is now part of the release, let's make sure we build it as part of the kata-deploy-test action. Fixes: #5859 Signed-off-by: Fabiano Fidêncio --- .github/workflows/kata-deploy-test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/kata-deploy-test.yaml b/.github/workflows/kata-deploy-test.yaml index 7f6839b40f..5a924c7390 100644 --- a/.github/workflows/kata-deploy-test.yaml +++ b/.github/workflows/kata-deploy-test.yaml @@ -50,6 +50,7 @@ jobs: - cloud-hypervisor - firecracker - kernel + - kernel-dragonball-experimental - nydus - qemu - rootfs-image From 8e8c720d51858b063e2b9c3e2aaa050f2f264e88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Mon, 30 Jan 2023 09:39:24 +0100 Subject: [PATCH 4/4] kata-deploy-push: Ensure we build Dragonball specific kernel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As the dragonball specific kernel is now part of the release, let's make sure we build it as part of the kata-deploy-push action. Fixes: #5859 Signed-off-by: Fabiano Fidêncio --- .github/workflows/kata-deploy-push.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/kata-deploy-push.yaml b/.github/workflows/kata-deploy-push.yaml index bdd0aeb2bd..c7d7e8cb4e 100644 --- a/.github/workflows/kata-deploy-push.yaml +++ b/.github/workflows/kata-deploy-push.yaml @@ -18,6 +18,7 @@ jobs: matrix: asset: - kernel + - kernel-dragonball-experimental - shim-v2 - qemu - cloud-hypervisor