github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-02 01:16:27 +00:00
Code Issues Projects Releases Wiki Activity

kata-manager: Allow passing a specific tool to test_installation

Browse Source 
Right now we're only testing with `ctr` and there's no change in
behaviour with this commit.  However, allowing to pass a tool to run the
tests with gives us an easier time when expanding kata-manager to
support, for instance, docker and nerdctl.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio
2023-11-03 12:09:45 +01:00
parent 50df1129ea
commit 0352f1e029
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
utils/kata-manager.sh
View File

@@ -722,19 +722,22 @@ handle_containerd()
test_installation() test_installation()
{ {
local tool="${1:-}"
[ -z "$tool" ] && die "The tool to test $kata_project with was not informed"
info "Testing $kata_project\n" info "Testing $kata_project\n"
sudo kata-runtime check -v sudo kata-runtime check -v
local image="docker.io/library/busybox:latest" local image="docker.io/library/busybox:latest"
sudo ctr image pull "$image" sudo $tool image pull "$image"
local container_name="test-kata" local container_name="test-kata"
# Used to prove that the kernel in the container # Used to prove that the kernel in the container
# is different to the host kernel. # is different to the host kernel.
local container_kernel local container_kernel
container_kernel=$(sudo ctr run \ container_kernel=$(sudo $tool run \
--runtime "$kata_runtime_type" \ --runtime "$kata_runtime_type" \
--rm \ --rm \
"$image" \ "$image" \
@@ -777,7 +780,10 @@ handle_installation()
local kata_version="${7:-}" local kata_version="${7:-}"
local containerd_flavour="${8:-}" local containerd_flavour="${8:-}"
[ "$only_run_test" = "true" ] && test_installation && return 0 # The tool to be testing the installation with
local tool="ctr"
[ "$only_run_test" = "true" ] && test_installation "$tool" && return 0
setup "$cleanup" "$force" "$skip_containerd" setup "$cleanup" "$force" "$skip_containerd"
@@ -789,7 +795,7 @@ handle_installation()
"$force" \ "$force" \
"$enable_debug" "$enable_debug"
[ "$disable_test" = "false" ] && test_installation [ "$disable_test" = "false" ] && test_installation "$tool"
if [ "$skip_containerd" = "true" ] if [ "$skip_containerd" = "true" ]
then then