From 08fe49f708e54a2a0e0cc5b90616bfaeb99a1156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano.fidencio@intel.com>
Date: Thu, 16 Mar 2023 12:09:34 +0100
Subject: [PATCH] versions: Adjust kernel names to match kata-deploy build
 targets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Let's adjust the kernel names in versions.yaml so those can match the
names used as part of the kata-deploy local build scripts.

Right now this doesn't bring any benefit nor drawback, but it'll make
our life easier later on in this same series.

Depends-on: github.com/kata-containers/tests#5534

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
---
 .../packaging/kata-deploy/local-build/kata-deploy-binaries.sh | 2 +-
 tools/packaging/kernel/build-kernel.sh                        | 4 ++--
 versions.yaml                                                 | 4 ++--
 3 files changed, 5 insertions(+), 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 ded375cb6d..79cf5a1411 100755
--- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
+++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
@@ -108,7 +108,7 @@ install_kernel() {
 #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)"
+	export kernel_version="$(yq r $versions_yaml assets.kernel-dragonball-experimental.version)"
 	info "kernel version ${kernel_version}"
 	DESTDIR="${destdir}" PREFIX="${prefix}" "${kernel_builder}" -e -t dragonball -v ${kernel_version}	
 }
diff --git a/tools/packaging/kernel/build-kernel.sh b/tools/packaging/kernel/build-kernel.sh
index 014e08359f..af7e36e6bd 100755
--- a/tools/packaging/kernel/build-kernel.sh
+++ b/tools/packaging/kernel/build-kernel.sh
@@ -556,7 +556,7 @@ main() {
 			case "${arch_target}" in
 			"aarch64")
 				build_type="arm-experimental"
-				kernel_version=$(get_from_kata_deps "assets.arm-kernel-experimental.version")
+				kernel_version=$(get_from_kata_deps "assets.kernel-arm-experimental.version")
 			;;
 			*)
 				info "No arch-specific experimental kernel supported, using experimental one instead"
@@ -564,7 +564,7 @@ main() {
 			;;
 			esac
 		elif [[ ${build_type} == "dragonball-experimental" ]]; then
-			kernel_version=$(get_from_kata_deps "assets.dragonball-kernel-experimental.version")
+			kernel_version=$(get_from_kata_deps "assets.kernel-dragonball-experimental.version")
 		elif [[ "${conf_guest}" != "" ]]; then
 			#If specifying a tag for kernel_version, must be formatted version-like to avoid unintended parsing issues
 			kernel_version=$(get_from_kata_deps "assets.kernel.${conf_guest}.version" 2>/dev/null || true)
diff --git a/versions.yaml b/versions.yaml
index b68bf8fbdd..817ff1202f 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -177,12 +177,12 @@ assets:
     url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/"
     tag: "v5.13.10"
 
-  arm-kernel-experimental:
+  kernel-arm-experimental:
     description: "Linux kernel with cpu/mem hotplug support on arm64"
     url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/"
     version: "v5.15.7"
 
-  dragonball-kernel-experimental:
+  kernel-dragonball-experimental:
     description: "Linux kernel with Dragonball VMM optimizations like upcall"
     url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/"
     version: "v5.10.25"