Merge branch 'fix-containerd-tests' into 'main'

Fix image in containerd tests

See merge request nvidia/container-toolkit/container-toolkit!206
This commit is contained in:
Evan Lezar 2022-08-12 13:46:24 +00:00
commit 33b4e7fb0a
4 changed files with 7 additions and 7 deletions

View File

@ -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

@ -1 +1 @@
Subproject commit eab474fef6d1e970f9c2e1011aa804082f29866e
Subproject commit 72a9d90adca6dfb78b7ea8b270f8f5c64c3169e4

@ -1 +1 @@
Subproject commit d2bb9d0afee2fc2be545a97b0fcda9bf553a1b29
Subproject commit 68b81a207bc936328955621708862ec72c6225d4

@ -1 +1 @@
Subproject commit 0c082f6e75ee7a02d85778d115c3b96c4d46f0d8
Subproject commit 80902fe3afab0b08502a47b2f0e134869f813aa2