github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-01 07:47:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9985 from GabyCT/topic/fixcrites

Browse Source 
cri-containerd: Remove use_devmapper variable for cri-containerd tests
This commit is contained in:
Alex Lyn 2024-07-10 10:13:27 +08:00 committed by GitHub
commit fa4af09658
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 8 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

@ -24,7 +24,6 @@ export PATH="$PATH:/usr/local/go/bin"
KATA_HYPERVISOR="${KATA_HYPERVISOR:-qemu}" KATA_HYPERVISOR="${KATA_HYPERVISOR:-qemu}"
RUNTIME=${RUNTIME:-containerd-shim-kata-${KATA_HYPERVISOR}-v2} RUNTIME=${RUNTIME:-containerd-shim-kata-${KATA_HYPERVISOR}-v2}
FACTORY_TEST=${FACTORY_TEST:-""} FACTORY_TEST=${FACTORY_TEST:-""}
USE_DEVMAPPER="${USE_DEVMAPPER:-false}"
ARCH=$(uname -m) ARCH=$(uname -m)
containerd_runtime_type="io.containerd.kata-${KATA_HYPERVISOR}.v2" containerd_runtime_type="io.containerd.kata-${KATA_HYPERVISOR}.v2"
@ -119,13 +118,6 @@ cat << EOF | sudo tee "${CONTAINERD_CONFIG_FILE}"
[plugins.linux] [plugins.linux]
shim = "${containerd_shim_path}" shim = "${containerd_shim_path}"
EOF EOF
if [ "$USE_DEVMAPPER" == "true" ]; then
sudo sed -i 's|^\(\[plugins\]\).*|\1\n \[plugins.devmapper\]\n pool_name = \"contd-thin-pool\"\n base_image_size = \"4096MB\"|' ${CONTAINERD_CONFIG_FILE}
echo "Devicemapper configured"
cat "${CONTAINERD_CONFIG_FILE}"
fi
} }
function cleanup() { function cleanup() {