From f62a88f1798627b7c61379b45c462557fb2060d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano.fidencio@intel.com>
Date: Thu, 20 Jul 2023 23:19:57 +0200
Subject: [PATCH] kata-deploy-binaries: Remove CC hypervisor builds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We can just rely on the hypervisors builds from `main`, with the TDX one
being the only discrepancy here.

However, we have a big note in the versions.yaml to **not** update the
TDX hypervisor versions on this branch, so we should be good.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
---
 .../kata-deploy/local-build/Makefile          | 17 +---
 .../local-build/kata-deploy-binaries.sh       | 91 +------------------
 .../static-build/qemu/build-static-qemu-cc.sh | 34 -------
 .../qemu/build-static-qemu-experimental-cc.sh | 36 --------
 4 files changed, 4 insertions(+), 174 deletions(-)
 delete mode 100755 tools/packaging/static-build/qemu/build-static-qemu-cc.sh
 delete mode 100755 tools/packaging/static-build/qemu/build-static-qemu-experimental-cc.sh

diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile
index 328bb3dd97..ab1d1b4117 100644
--- a/tools/packaging/kata-deploy/local-build/Makefile
+++ b/tools/packaging/kata-deploy/local-build/Makefile
@@ -11,15 +11,13 @@ V := 1
 ARCH := $(shell uname -m)
 
 ifeq ($(ARCH), x86_64)
-EXTRA_TARBALL=cc-cloud-hypervisor-tarball \
+EXTRA_TARBALL=\
 	cc-tdx-kernel-tarball \
-	cc-tdx-qemu-tarball \
 	cc-tdx-td-shim-tarball \
 	cc-tdx-tdvf-tarball \
 	cc-sev-ovmf-tarball \
 	cc-x86_64-ovmf-tarball \
 	cc-sev-rootfs-initrd-tarball \
-	cc-snp-qemu-tarball \
 	cc-tdx-rootfs-image-tarball
 endif
 
@@ -156,24 +154,14 @@ cc-parallel: $(MK_DIR)/dockerbuild/install_yq.sh
 	${MAKE} -f $(MK_PATH) cc -j$$(( $$(nproc) - 1  )) V=
 
 cc: cc-kernel-tarball \
-	cc-qemu-tarball \
 	cc-rootfs-image-tarball \
 	cc-virtiofsd-tarball \
 	cc-shim-v2-tarball \
 	${EXTRA_TARBALL}
 
-cc-cloud-hypervisor-tarball:
-	${MAKE} $@-build
-
 cc-kernel-tarball:
 	${MAKE} $@-build
 
-cc-qemu-tarball:
-	${MAKE} $@-build
-
-cc-snp-qemu-tarball:
-	${MAKE} $@-build
-
 cc-rootfs-image-tarball:
 	${MAKE} $@-build
 
@@ -201,9 +189,6 @@ cc-tdx-kernel-tarball:
 cc-sev-kernel-tarball:
 	${MAKE} $@-build
 
-cc-tdx-qemu-tarball:
-	${MAKE} $@-build
-
 cc-tdx-td-shim-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 26d64fa075..fc55dddf12 100755
--- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
+++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
@@ -29,7 +29,6 @@ readonly kernel_builder="${static_build_dir}/kernel/build.sh"
 readonly ovmf_builder="${static_build_dir}/ovmf/build.sh"
 readonly qemu_builder="${static_build_dir}/qemu/build-static-qemu.sh"
 readonly qemu_experimental_builder="${static_build_dir}/qemu/build-static-qemu-experimental.sh"
-readonly qemu_experimental_cc_builder="${static_build_dir}/qemu/build-static-qemu-experimental-cc.sh"
 readonly shimv2_builder="${static_build_dir}/shim-v2/build.sh"
 readonly td_shim_builder="${static_build_dir}/td-shim/build.sh"
 readonly virtiofsd_builder="${static_build_dir}/virtiofsd/build.sh"
@@ -39,7 +38,6 @@ readonly rootfs_builder="${repo_root_dir}/tools/packaging/guest-image/build_imag
 readonly se_image_builder="${repo_root_dir}/tools/packaging/guest-image/build_se_image.sh"
 
 readonly cc_prefix="/opt/confidential-containers"
-readonly qemu_cc_builder="${static_build_dir}/qemu/build-static-qemu-cc.sh"
 
 source "${script_dir}/../../scripts/lib.sh"
 
@@ -112,13 +110,9 @@ options:
 	tdvf
 	virtiofsd
 	cc
-	cc-cloud-hypervisor
 	cc-kernel
 	cc-tdx-kernel
 	cc-sev-kernel
-	cc-qemu
-	cc-snp-qemu
-	cc-tdx-qemu
 	cc-rootfs-image
 	cc-rootfs-initrd
 	cc-sev-rootfs-initrd
@@ -231,28 +225,6 @@ install_cached_cc_shim_v2() {
 		"$(basename ${root_hash_tdx})"
 }
 
-# Install static CC cloud-hypervisor asset
-install_cc_clh() {
-	install_cached_tarball_component \
-		"cloud-hypervisor" \
-		"${jenkins_url}/job/kata-containers-2.0-clh-cc-$(uname -m)/${cached_artifacts_path}" \
-		"$(get_from_kata_deps "assets.hypervisor.cloud_hypervisor.version")" \
-		"" \
-		"${final_tarball_name}" \
-		"${final_tarball_path}" \
-		&& return 0
-
-	if [[ "${ARCH}" == "x86_64" ]]; then
-		export features="tdx"
-	fi
-
-	info "build static CC cloud-hypervisor"
-	"${clh_builder}"
-	info "Install static CC cloud-hypervisor"
-	mkdir -p "${destdir}/${cc_prefix}/bin/"
-	sudo install -D --owner root --group root --mode 0744 cloud-hypervisor/cloud-hypervisor "${destdir}/${cc_prefix}/bin/cloud-hypervisor"
-}
-
 #Install cc capable guest image
 install_cc_image() {
 	export AA_KBC="${1:-offline_fs_kbc}"
@@ -355,25 +327,6 @@ install_cc_kernel() {
 	DESTDIR="${destdir}" PREFIX="${cc_prefix}" "${kernel_builder}" -f -v "${kernel_version}"
 }
 
-# Install static CC qemu asset
-install_cc_qemu() {
-	info "build static CC qemu"
-	export qemu_repo="$(yq r $versions_yaml assets.hypervisor.qemu.url)"
-	export qemu_version="$(yq r $versions_yaml assets.hypervisor.qemu.version)"
-
-	install_cached_tarball_component \
-		"QEMU" \
-		"${jenkins_url}/job/kata-containers-2.0-qemu-cc-$(uname -m)/${cached_artifacts_path}" \
-		"${qemu_version}-$(calc_qemu_files_sha256sum)" \
-		"$(get_qemu_image_name)" \
-		"${final_tarball_name}" \
-		"${final_tarball_path}" \
-		&& return 0
-
-	"${qemu_cc_builder}"
-	tar xvf "${builddir}/kata-static-qemu-cc.tar.gz" -C "${destdir}"
-}
-
 #Install all components that are not assets
 install_cc_shimv2() {
 	local shim_v2_last_commit="$(get_last_modification "${repo_root_dir}/src/runtime")"
@@ -502,32 +455,6 @@ install_cc_sev_kernel() {
 	install_cc_tee_kernel "sev" "${kernel_version}" "${module_dir}"
 }
 
-install_cc_tee_qemu() {
-	tee="${1}"
-
-	[ "${tee}" != "tdx" ] && die "Non supported TEE"
-
-	export qemu_repo="$(yq r $versions_yaml assets.hypervisor.qemu.${tee}.url)"
-	export qemu_version="$(yq r $versions_yaml assets.hypervisor.qemu.${tee}.tag)"
-	export tee="${tee}"
-
-	install_cached_tarball_component \
-		"QEMU ${tee}" \
-		"${jenkins_url}/job/kata-containers-2.0-qemu-${tee}-cc-$(uname -m)/${cached_artifacts_path}" \
-		"${qemu_version}-$(calc_qemu_files_sha256sum)" \
-		"$(get_qemu_image_name)" \
-		"${final_tarball_name}" \
-		"${final_tarball_path}" \
-		&& return 0
-
-	"${qemu_cc_builder}"
-	tar xvf "${builddir}/kata-static-${tee}-qemu-cc.tar.gz" -C "${destdir}"
-}
-
-install_cc_tdx_qemu() {
-	install_cc_tee_qemu "tdx"
-}
-
 install_cc_tdx_td_shim() {
 	install_cached_tarball_component \
 		"td-shim" \
@@ -827,16 +754,15 @@ install_qemu_tdx_experimental() {
 		"${qemu_experimental_builder}"
 }
 
-install_cc_snp_qemu_experimental() {
+install_qemu_snp_experimental() {
 	export qemu_suffix="snp-experimental"
-	export qemu_tarball_name="kata-static-qemu-${qemu_suffix}-cc.tar.gz"
-	export tee="snp"
+	export qemu_tarball_name="kata-static-qemu-${qemu_suffix}.tar.gz"
 
 	install_qemu_helper \
 		"assets.hypervisor.qemu-${qemu_suffix}.url" \
 		"assets.hypervisor.qemu-${qemu_suffix}.tag" \
 		"qemu-${qemu_suffix}" \
-		"${qemu_experimental_cc_builder}"
+		"${qemu_experimental_builder}"
 }
 
 # Install static firecracker asset
@@ -1044,24 +970,15 @@ handle_build() {
 		;;
 
 	cc)
-		install_cc_clh
 		install_cc_kernel
-		install_cc_qemu
-		install_cc_snp_qemu_experimental
 		install_cc_image
 		install_cc_shimv2
 		install_cc_virtiofsd
 		install_cc_sev_image
 		;;
 
-	cc-cloud-hypervisor) install_cc_clh ;;
-
 	cc-kernel) install_cc_kernel ;;
 
-	cc-qemu) install_cc_qemu ;;
-
-	cc-snp-qemu) install_cc_snp_qemu_experimental ;;
-
 	cc-rootfs-image) install_cc_image ;;
 
 	cc-rootfs-initrd) install_cc_initrd ;;
@@ -1080,8 +997,6 @@ handle_build() {
 
 	cc-sev-kernel) install_cc_sev_kernel ;;
 
-	cc-tdx-qemu) install_cc_tdx_qemu ;;
-
 	cc-tdx-td-shim) install_cc_tdx_td_shim ;;
 
 	cc-tdx-tdvf) install_cc_tdx_tdvf ;;
diff --git a/tools/packaging/static-build/qemu/build-static-qemu-cc.sh b/tools/packaging/static-build/qemu/build-static-qemu-cc.sh
deleted file mode 100755
index 4ec3dcfd16..0000000000
--- a/tools/packaging/static-build/qemu/build-static-qemu-cc.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2022 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-source "${script_dir}/../../scripts/lib.sh"
-
-qemu_repo="${qemu_repo:-}"
-qemu_version="${qemu_version:-}"
-tee="${tee:-}"
-
-export prefix="/opt/confidential-containers/"
-
-if [ -z "${qemu_repo}" ]; then
-	info "Get qemu information from runtime versions.yaml"
-	export qemu_url=$(get_from_kata_deps "assets.hypervisor.qemu.url")
-	[ -n "${qemu_url}" ] || die "failed to get qemu url"
-	export qemu_repo="${qemu_url}.git"
-fi
-
-[ -n "${qemu_repo}" ] || die "failed to get qemu repo"
-[ -n "${qemu_version}" ] || export qemu_version=$(get_from_kata_deps "assets.hypervisor.qemu.version")
-[ -n "${qemu_version}" ] || die "failed to get qemu version"
-
-qemu_tarball_name="kata-static-qemu-cc.tar.gz"
-[ -n "${tee}" ] && qemu_tarball_name="kata-static-${tee}-qemu-cc.tar.gz"
-"${script_dir}/build-base-qemu.sh" "${qemu_repo}" "${qemu_version}" "${tee}" "${qemu_tarball_name}"
diff --git a/tools/packaging/static-build/qemu/build-static-qemu-experimental-cc.sh b/tools/packaging/static-build/qemu/build-static-qemu-experimental-cc.sh
deleted file mode 100755
index b12835f2c3..0000000000
--- a/tools/packaging/static-build/qemu/build-static-qemu-experimental-cc.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2022 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-source "${script_dir}/../../scripts/lib.sh"
-
-qemu_repo="${qemu_repo:-}"
-qemu_version="${qemu_version:-}"
-qemu_suffix="${qemu_suffix:-experimental}"
-tee="${tee:-}"
-qemu_tarball_name="${qemu_tarball_name:-kata-static-qemu-experimental.tar.gz}"
-
-export prefix="/opt/confidential-containers/"
-
-if [ -z "${qemu_repo}" ]; then
-	info "Get qemu information from runtime versions.yaml"
-	export qemu_url=$(get_from_kata_deps "assets.hypervisor.qemu.url")
-	[ -n "${qemu_url}" ] || die "failed to get qemu url"
-	export qemu_repo="${qemu_url}.git"
-fi
-
-[ -n "${qemu_repo}" ] || die "failed to get qemu repo"
-[ -n "${qemu_version}" ] || export qemu_version=$(get_from_kata_deps "assets.hypervisor.qemu.version")
-[ -n "${qemu_version}" ] || die "failed to get qemu version"
-
-qemu_tarball_name="kata-static-qemu-experimental-cc.tar.gz"
-[ -n "${tee}" ] && qemu_tarball_name="kata-static-qemu-${tee}-experimental-cc.tar.gz"
-"${script_dir}/build-base-qemu.sh" "${qemu_repo}" "${qemu_version}" "${qemu_suffix}" "${qemu_tarball_name}"