From 5816c132ec26f9659bb4c760c0e5eea280014b51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 16 Feb 2022 13:58:33 +0100 Subject: [PATCH 1/2] tools: Build cloud-hypervisor with "--features tdx" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Right now TDx support on Cloud Hypervisor is gated behind a "--features tdx" flag. However, having TDx support enabled should not and does not impact on the general usability of cloud-hypervisor. As sooner than later we'll need kata-deploy binaries to be tested on a CI that's TDx capable, for the confidential containers effort, let's take the bullet and already enable it by default. By the way, touching kata-deploy-binaries.sh as it's ensure the change will be used in the following workflows: * kata-deploy-push * kata-deploy-test * release Fixes: #3688 Signed-off-by: Fabiano Fidêncio --- tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh | 1 + 1 file changed, 1 insertion(+) 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 b5b1717a9..a9ef4e0b0 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -130,6 +130,7 @@ install_clh() { cloud_hypervisor_repo="$(yq r $versions_yaml assets.hypervisor.cloud_hypervisor.url)" cloud_hypervisor_version="$(yq r $versions_yaml assets.hypervisor.cloud_hypervisor.version)" + export extra_build_args="--features tdx" info "build static cloud-hypervisor" "${clh_builder}" From a6b40151300c4cef9b4c2af780fa199123290d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 16 Feb 2022 14:52:25 +0100 Subject: [PATCH 2/2] tools: clh: Remove unused variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Right now we're getting the info for the Cloud Hypervisor repo and version, but we don't do anything with them, as those are not passed down to the build script. Morever, the build script itself gets the info from exactly the same place when those are not passed, making those redundant. Signed-off-by: Fabiano Fidêncio --- .../kata-deploy/local-build/kata-deploy-binaries.sh | 5 ----- 1 file changed, 5 deletions(-) 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 a9ef4e0b0..1864140e1 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -125,11 +125,6 @@ install_firecracker() { # Install static cloud-hypervisor asset install_clh() { - local cloud_hypervisor_repo - local cloud_hypervisor_version - - cloud_hypervisor_repo="$(yq r $versions_yaml assets.hypervisor.cloud_hypervisor.url)" - cloud_hypervisor_version="$(yq r $versions_yaml assets.hypervisor.cloud_hypervisor.version)" export extra_build_args="--features tdx" info "build static cloud-hypervisor"