From c2205c14fb9c9a16e159e0205dfdb1f248fa82da Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 10 Aug 2022 13:47:45 +0200 Subject: [PATCH 1/2] Update subcomponents Signed-off-by: Evan Lezar --- third_party/libnvidia-container | 2 +- third_party/nvidia-container-runtime | 2 +- third_party/nvidia-docker | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/third_party/libnvidia-container b/third_party/libnvidia-container index eab474fe..72a9d90a 160000 --- a/third_party/libnvidia-container +++ b/third_party/libnvidia-container @@ -1 +1 @@ -Subproject commit eab474fef6d1e970f9c2e1011aa804082f29866e +Subproject commit 72a9d90adca6dfb78b7ea8b270f8f5c64c3169e4 diff --git a/third_party/nvidia-container-runtime b/third_party/nvidia-container-runtime index d2bb9d0a..68b81a20 160000 --- a/third_party/nvidia-container-runtime +++ b/third_party/nvidia-container-runtime @@ -1 +1 @@ -Subproject commit d2bb9d0afee2fc2be545a97b0fcda9bf553a1b29 +Subproject commit 68b81a207bc936328955621708862ec72c6225d4 diff --git a/third_party/nvidia-docker b/third_party/nvidia-docker index 0c082f6e..80902fe3 160000 --- a/third_party/nvidia-docker +++ b/third_party/nvidia-docker @@ -1 +1 @@ -Subproject commit 0c082f6e75ee7a02d85778d115c3b96c4d46f0d8 +Subproject commit 80902fe3afab0b08502a47b2f0e134869f813aa2 From 936da0295bf092948ae7697a3590f29a6ea510c6 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Fri, 12 Aug 2022 14:23:24 +0200 Subject: [PATCH 2/2] Use proper cuda image for containerd tests Signed-off-by: Evan Lezar --- test/container/containerd_test.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/container/containerd_test.sh b/test/container/containerd_test.sh index 42770104..ea03f77a 100755 --- a/test/container/containerd_test.sh +++ b/test/container/containerd_test.sh @@ -43,8 +43,8 @@ testing::containerd::toolkit::run() { # Ensure that we can run some non GPU containers from within dind with_retry 3 5s testing::containerd::dind::exec " \ - ctr --address=${containerd_dind_containerd_dir}/containerd.sock image pull nvcr.io/nvidia/cuda-11.1.1-base-ubuntu20.04; \ - ctr --address=${containerd_dind_containerd_dir}/containerd.sock run --rm --runtime=io.containerd.runtime.v1.linux nvcr.io/nvidia/cuda-11.1.1-base-ubuntu20.04 cuda echo foo" + ctr --address=${containerd_dind_containerd_dir}/containerd.sock image pull nvcr.io/nvidia/cuda:11.1.1-base-ubuntu20.04; \ + ctr --address=${containerd_dind_containerd_dir}/containerd.sock run --rm --runtime=io.containerd.runtime.v1.linux nvcr.io/nvidia/cuda:11.1.1-base-ubuntu20.04 cuda echo foo" # Share the volumes so that we can edit the config file and point to the new runtime # Share the pid so that we can ask docker to reload its config @@ -63,8 +63,8 @@ testing::containerd::toolkit::run() { # Ensure that we haven't broken non GPU containers with_retry 3 5s testing::containerd::dind::exec " \ - ctr --address=${containerd_dind_containerd_dir}/containerd.sock image pull nvcr.io/nvidia/cuda-11.1.1-base-ubuntu20.04; \ - ctr --address=${containerd_dind_containerd_dir}/containerd.sock run --rm --runtime=io.containerd.runtime.v1.linux nvcr.io/nvidia/cuda-11.1.1-base-ubuntu20.04 cuda echo foo" + ctr --address=${containerd_dind_containerd_dir}/containerd.sock image pull nvcr.io/nvidia/cuda:11.1.1-base-ubuntu20.04; \ + ctr --address=${containerd_dind_containerd_dir}/containerd.sock run --rm --runtime=io.containerd.runtime.v1.linux nvcr.io/nvidia/cuda:11.1.1-base-ubuntu20.04 cuda echo foo" } # This test runs containerd setup and containerd cleanup in succession to ensure that the