From c3637039f42b0a11d836204235542ffa3599cd4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano.fidencio@intel.com>
Date: Fri, 14 Jul 2023 17:09:56 +0200
Subject: [PATCH] ci: cri-containerd: Remove KILL_VMM_TEST env var
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We don't need the env var, we just need to restrict the test according
to the KATA_HYPERVISOR used, as right now it's very specifict to QEMU.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
---
 tests/integration/cri-containerd/integration-tests.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/integration/cri-containerd/integration-tests.sh b/tests/integration/cri-containerd/integration-tests.sh
index f29f124e1a..7f3077cd88 100755
--- a/tests/integration/cri-containerd/integration-tests.sh
+++ b/tests/integration/cri-containerd/integration-tests.sh
@@ -21,7 +21,6 @@ export PATH="$PATH:/usr/local/sbin"
 # Runtime to be used for testing
 RUNTIME=${RUNTIME:-containerd-shim-kata-v2}
 FACTORY_TEST=${FACTORY_TEST:-""}
-KILL_VMM_TEST=${KILL_VMM_TEST:-""}
 KATA_HYPERVISOR="${KATA_HYPERVISOR:-qemu}"
 USE_DEVMAPPER="${USE_DEVMAPPER:-false}"
 ARCH=$(uname -m)
@@ -74,7 +73,7 @@ ci_cleanup() {
 		sudo -E PATH=$PATH "$RUNTIME" factory destroy
 	fi
 
-	if [ -n "${KILL_VMM_TEST}" ] && [ -e "$default_containerd_config_backup" ]; then
+	if [ -e "$default_containerd_config_backup" ]; then
 		echo "restore containerd config"
 		sudo systemctl stop containerd
 		sudo cp "$default_containerd_config_backup" "$default_containerd_config"
@@ -210,8 +209,9 @@ testContainerStop() {
 }
 
 TestKilledVmmCleanup() {
-	if [ -z "${KILL_VMM_TEST}" ]; then
-		return
+	if [[ "${KATA_HYPERVISOR}" != "qemu" ]]; then
+		info "TestKilledVmmCleanup is skipped for ${KATA_HYPERVISOR}, only QEMU is currently tested"
+		return 0
 	fi
 
 	info "test killed vmm cleanup"