mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-07-16 00:16:52 +00:00
fixup! ci: Enable cri-containerd-tests for arm64
This commit is contained in:
parent
50f6b250e6
commit
74fbe42be1
@ -103,24 +103,34 @@ function create_containerd_config() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# check containerd config version
|
# check containerd config version
|
||||||
|
#
|
||||||
|
# we're only testing with config version 2 and 3,
|
||||||
|
# as that's what all sypported versions of containerd
|
||||||
|
# have at this moment in time.
|
||||||
|
local pluginid=\"io.containerd.grpc.v1.cri\"
|
||||||
|
local version="2"
|
||||||
|
|
||||||
if containerd config default | grep -q "version = 3\>"; then
|
if containerd config default | grep -q "version = 3\>"; then
|
||||||
pluginid=\"io.containerd.cri.v1.runtime\"
|
pluginid=\"io.containerd.cri.v1.runtime\"
|
||||||
else
|
version="3"
|
||||||
pluginid="cri"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
info "Kata Config Path ${runtime_config_path}, Runtime Binary Name ${runtime_binary_path}"
|
info "Kata Config Path ${runtime_config_path}, Runtime Binary Name ${runtime_binary_path}"
|
||||||
|
|
||||||
cat << EOF | sudo tee "${CONTAINERD_CONFIG_FILE}"
|
cat << EOF | sudo tee "${CONTAINERD_CONFIG_FILE}"
|
||||||
|
$( [ -n "${version}" ] && \
|
||||||
|
echo "version = ${version}"
|
||||||
|
)
|
||||||
[debug]
|
[debug]
|
||||||
level = "debug"
|
level = "debug"
|
||||||
[plugins]
|
[plugins]
|
||||||
[plugins.${pluginid}]
|
[plugins.${pluginid}]
|
||||||
[plugins.${pluginid}.containerd]
|
[plugins.${pluginid}.containerd]
|
||||||
default_runtime_name = "$runtime"
|
default_runtime_name = "${runtime}"
|
||||||
[plugins.${pluginid}.containerd.runtimes.${runtime}]
|
[plugins.${pluginid}.containerd.runtimes.${runtime}]
|
||||||
runtime_type = "${runtime_type}"
|
runtime_type = "${runtime_type}"
|
||||||
sandboxer = "${SANDBOXER}"
|
sandboxer = "${SANDBOXER}"
|
||||||
$( [ $kata_annotations -eq 1 ] && \
|
$( [ ${kata_annotations} -eq 1 ] && \
|
||||||
echo 'pod_annotations = ["io.katacontainers.*"]' && \
|
echo 'pod_annotations = ["io.katacontainers.*"]' && \
|
||||||
echo ' container_annotations = ["io.katacontainers.*"]'
|
echo ' container_annotations = ["io.katacontainers.*"]'
|
||||||
)
|
)
|
||||||
@ -128,7 +138,7 @@ cat << EOF | sudo tee "${CONTAINERD_CONFIG_FILE}"
|
|||||||
ConfigPath = "${runtime_config_path}"
|
ConfigPath = "${runtime_config_path}"
|
||||||
BinaryName = "${runtime_binary_path}"
|
BinaryName = "${runtime_binary_path}"
|
||||||
$( [ -n "$containerd_shim_path" ] && \
|
$( [ -n "$containerd_shim_path" ] && \
|
||||||
echo "[plugins.linux]" && \
|
echo "[plugins.${pluginid}.linux]" && \
|
||||||
echo " shim = \"${containerd_shim_path}\""
|
echo " shim = \"${containerd_shim_path}\""
|
||||||
)
|
)
|
||||||
EOF
|
EOF
|
||||||
|
Loading…
Reference in New Issue
Block a user