From 762ec28a6b70e086b280712dd91112f6562a4c63 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Sun, 1 Mar 2020 17:28:17 -0500 Subject: [PATCH] tests: Drop kata-runtime env validation if KATA_DEV_MODE is set If KATA_DEV_MODE is set, test_images.sh attempts to validate that docker has kata-runtime as a configured --runtime value. This gives a nicer and earlier error, but it also complicates using /usr/bin/docker as provided by podman, which has a different 'info' topology. Let's drop the check and let the tests fail naturally if the host isn't configured properly Signed-off-by: Cole Robinson --- tests/test_images.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/test_images.sh b/tests/test_images.sh index b8b7d4597..4b185a691 100755 --- a/tests/test_images.sh +++ b/tests/test_images.sh @@ -293,12 +293,6 @@ setup() sudo cp -a /usr/share/defaults/kata-containers/configuration.toml /etc/kata-containers/configuration.toml else info "Running with KATA_DEV_MODE set, skipping installation of docker and kata packages" - # Make sure docker & kata are available - command -v docker >/dev/null || die "docker cannot be found on your PATH" - local cfgRuntime= - cfgRuntime="$(docker info --format "{{(index .Runtimes \"${RUNTIME}\").Path}}")" - [ -n "$cfgRuntime" ] || die "${RUNTIME} is not a configured runtime for docker" - [ -x "$cfgRuntime" ] || die "docker ${RUNTIME} is linked to an invalid executable: $cfgRuntime" fi run_mgr enable-debug