From ae3ea1421dbfdf9c4075daa40fca072d98d045f9 Mon Sep 17 00:00:00 2001
From: "James O. D. Hunt" <james.o.hunt@intel.com>
Date: Thu, 26 Oct 2023 16:07:33 +0100
Subject: [PATCH] utils: kata-manager: Fix containerd version check
Contained release files include the version number without a "v" prefix.
However, the tag for the equivalent release does include it so handle
this distinction and also tighten up the Kata check by specifying an
explicit version number in the regex.
Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
---
utils/kata-manager.sh | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/utils/kata-manager.sh b/utils/kata-manager.sh
index c7a2c6e71c..e17982c685 100755
--- a/utils/kata-manager.sh
+++ b/utils/kata-manager.sh
@@ -143,6 +143,10 @@ github_get_release_file_url()
local url="${1:-}"
local version="${2:-}"
+ # The version, less any leading 'v'
+ local version_number
+ version_number=${version#v}
+
local arch
arch=$(uname -m)
[ "$arch" = "x86_64" ] && arch="amd64"
@@ -151,11 +155,11 @@ github_get_release_file_url()
case "$url" in
*kata*)
- regex="kata-static-.*-${arch}.tar.xz"
+ regex="kata-static-${version}-${arch}.tar.xz"
;;
*containerd*)
- regex="containerd-.*-linux-${arch}.tar.gz"
+ regex="containerd-${version_number}-linux-${arch}.tar.gz"
;;
*) die "invalid url: '$url'" ;;
@@ -165,8 +169,10 @@ github_get_release_file_url()
download_url=$(curl -sL "$url" |\
jq --arg version "$version" \
- -r '.[] | select(.tag_name == $version) | .assets[].browser_download_url' |\
- grep "/${regex}$")
+ -r '.[] |
+ select( (.tag_name == $version) or (.tag_name == "v" + $version) ) |
+ .assets[].browser_download_url' |\
+ grep "/${regex}$")
download_url=$(echo "$download_url" | awk '{print $1}')