Add --cdi-enabled option to control generating CDI spec

Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar
2023-03-13 18:18:54 +02:00
parent 92ea8be309
commit 08ef242afb
4 changed files with 12 additions and 3 deletions

View File

@@ -54,7 +54,6 @@ testing::containerd::toolkit::run() {
--pid "container:${containerd_dind_ctr}" \
-e RUNTIME="containerd" \
-e RUNTIME_ARGS="--config=${containerd_dind_containerd_dir}/containerd.toml --socket=${containerd_dind_containerd_dir}/containerd.sock" \
-e CDI_OUTPUT_DIR="" \
--name "${containerd_test_ctr}" \
"${toolkit_container_image}" "/usr/local/nvidia" "--no-daemon"

View File

@@ -39,7 +39,6 @@ testing::docker::toolkit::run() {
--volumes-from "${docker_dind_ctr}" \
--pid "container:${docker_dind_ctr}" \
-e RUNTIME_ARGS="--socket ${docker_dind_socket}" \
-e CDI_OUTPUT_DIR="" \
--name "${docker_test_ctr}" \
"${toolkit_container_image}" "/usr/local/nvidia" "--no-daemon"

View File

@@ -23,7 +23,7 @@ testing::toolkit::install() {
READLINK="greadlink"
fi
testing::docker_run::toolkit::shell 'toolkit install --toolkit-root=/usr/local/nvidia/toolkit --cdi-output-dir=""'
testing::docker_run::toolkit::shell 'toolkit install --toolkit-root=/usr/local/nvidia/toolkit'
docker run --rm -v "${shared_dir}:/work" alpine sh -c "chown -R ${uid}:${gid} /work/"
# Ensure toolkit dir is correctly setup