github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-29 12:14:48 +00:00
Code Issues Projects Releases Wiki Activity

ci: cri-containerd: Remove KILL_VMM_TEST env var

Browse Source 
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>
This commit is contained in:
Fabiano Fidêncio 2023-07-14 17:09:56 +02:00
parent bc4919f9b2
commit c3637039f4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/integration/cri-containerd/integration-tests.sh
View File

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