From 698a9d3244ab2e9daee9e6443fe0b4b75ac415a0 Mon Sep 17 00:00:00 2001
From: Jianyong Wu <jianyong.wu@arm.com>
Date: Wed, 8 Nov 2023 06:48:52 +0000
Subject: [PATCH] correct tarball build directory

Depends-on: github.com/kata-containers/kata-containers#8430
---
 .ci/install_kata_kernel.sh | 3 +++
 .ci/install_qemu.sh        | 9 +++++++--
 .ci/lib.sh                 | 3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.ci/install_kata_kernel.sh b/.ci/install_kata_kernel.sh
index ebeb5db85..a5db17c1f 100755
--- a/.ci/install_kata_kernel.sh
+++ b/.ci/install_kata_kernel.sh
@@ -77,6 +77,9 @@ main() {
 		experimental)
 			build_and_install_kernel "kernel-experimental"
 			;;
+		arm-experimental)
+			build_and_install_kernel "kernel-arm-experimental"
+			;;
 		vanilla)
 			build_and_install_kernel "kernel"
 			;;
diff --git a/.ci/install_qemu.sh b/.ci/install_qemu.sh
index d2df296fd..cb800525f 100755
--- a/.ci/install_qemu.sh
+++ b/.ci/install_qemu.sh
@@ -90,13 +90,16 @@ main() {
 		vanilla)
 			qemu_type="qemu"
 			;;
+		arm-experimental)
+			qemu_type="qemu-arm-experimental"
+			;;
 		*)
 			die_unsupported_qemu_type "$qemu_type"
 			;;
 	esac
 
 	case ${QEMU_ARCH} in
-		"aarch64"|"ppc64le")
+		"ppc64le")
 			# We're still no there for using the kata-deploy
 			# scripts with ppc64le and aarch64.
 			CURRENT_QEMU_VERSION=$(get_version "assets.hypervisor.qemu.version")
@@ -110,8 +113,10 @@ main() {
 
 			build_and_install_qemu
 			;;
-		"x86_64"|"s390x")
+		"aarch64"|"x86_64"|"s390x")
 			build_static_artifact_and_install "${qemu_type}"
+			sudo rm -f /opt/kata/bin/qemu-system-aarch64
+			sudo ln -s /opt/kata/bin/qemu-system-aarch64-arm-experimental /opt/kata/bin/qemu-system-aarch64
 			;;
 		*)
 			die "Architecture ${QEMU_ARCH} not supported"
diff --git a/.ci/lib.sh b/.ci/lib.sh
index 7156a3a26..c783bc0c2 100755
--- a/.ci/lib.sh
+++ b/.ci/lib.sh
@@ -173,8 +173,9 @@ function build_static_artifact_and_install() {
 
 	clone_katacontainers_repo
 
-	pushd "$katacontainers_repo_dir" >/dev/null
+	pushd "$katacontainers_repo_dir/tools/packaging/kata-deploy/local-build" >/dev/null
 	sudo -E PATH=$PATH make "$make_target"
+	pwd
 	sudo tar -xvJpf "build/${tarball}" -C "${destdir}"
 	sudo rm -rf "build/"
 	popd >/dev/null