From da6b849cf6f1aa9d9775982a44810bc865af6651 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Tue, 13 May 2025 22:24:37 +0200 Subject: [PATCH 1/3] [no-relnote] Use cuda 12.9.0 image in tests Signed-off-by: Evan Lezar --- tests/e2e/nvidia-container-toolkit_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/e2e/nvidia-container-toolkit_test.go b/tests/e2e/nvidia-container-toolkit_test.go index 9fcee330..22028307 100644 --- a/tests/e2e/nvidia-container-toolkit_test.go +++ b/tests/e2e/nvidia-container-toolkit_test.go @@ -173,10 +173,10 @@ var _ = Describe("docker", Ordered, ContinueOnFailure, func() { When("Testing CUDA Forward compatibility", Ordered, func() { BeforeAll(func(ctx context.Context) { - _, _, err := runner.Run("docker pull nvcr.io/nvidia/cuda:12.8.0-base-ubi8") + _, _, err := runner.Run("docker pull nvcr.io/nvidia/cuda:12.9.0-base-ubi8") Expect(err).ToNot(HaveOccurred()) - compatOutput, _, err := runner.Run("docker run --rm -i -e NVIDIA_VISIBLE_DEVICES=void nvcr.io/nvidia/cuda:12.8.0-base-ubi8 bash -c \"ls /usr/local/cuda/compat/libcuda.*.*\"") + compatOutput, _, err := runner.Run("docker run --rm -i -e NVIDIA_VISIBLE_DEVICES=void nvcr.io/nvidia/cuda:12.9.0-base-ubi8 bash -c \"ls /usr/local/cuda/compat/libcuda.*.*\"") Expect(err).ToNot(HaveOccurred()) Expect(compatOutput).ToNot(BeEmpty()) @@ -199,19 +199,19 @@ var _ = Describe("docker", Ordered, ContinueOnFailure, func() { }) It("should work with the nvidia runtime in legacy mode", func(ctx context.Context) { - ldconfigOut, _, err := runner.Run("docker run --rm -i -e NVIDIA_DISABLE_REQUIRE=true --runtime=nvidia --gpus all nvcr.io/nvidia/cuda:12.8.0-base-ubi8 bash -c \"ldconfig -p | grep libcuda.so.1\"") + ldconfigOut, _, err := runner.Run("docker run --rm -i -e NVIDIA_DISABLE_REQUIRE=true --runtime=nvidia --gpus all nvcr.io/nvidia/cuda:12.9.0-base-ubi8 bash -c \"ldconfig -p | grep libcuda.so.1\"") Expect(err).ToNot(HaveOccurred()) Expect(ldconfigOut).To(ContainSubstring("/usr/local/cuda/compat")) }) It("should work with the nvidia runtime in CDI mode", func(ctx context.Context) { - ldconfigOut, _, err := runner.Run("docker run --rm -i -e NVIDIA_DISABLE_REQUIRE=true --runtime=nvidia -e NVIDIA_VISIBLE_DEVICES=runtime.nvidia.com/gpu=all nvcr.io/nvidia/cuda:12.8.0-base-ubi8 bash -c \"ldconfig -p | grep libcuda.so.1\"") + ldconfigOut, _, err := runner.Run("docker run --rm -i -e NVIDIA_DISABLE_REQUIRE=true --runtime=nvidia -e NVIDIA_VISIBLE_DEVICES=runtime.nvidia.com/gpu=all nvcr.io/nvidia/cuda:12.9.0-base-ubi8 bash -c \"ldconfig -p | grep libcuda.so.1\"") Expect(err).ToNot(HaveOccurred()) Expect(ldconfigOut).To(ContainSubstring("/usr/local/cuda/compat")) }) It("should NOT work with nvidia-container-runtime-hook", func(ctx context.Context) { - ldconfigOut, _, err := runner.Run("docker run --rm -i -e NVIDIA_DISABLE_REQUIRE=true --runtime=runc --gpus all nvcr.io/nvidia/cuda:12.8.0-base-ubi8 bash -c \"ldconfig -p | grep libcuda.so.1\"") + ldconfigOut, _, err := runner.Run("docker run --rm -i -e NVIDIA_DISABLE_REQUIRE=true --runtime=runc --gpus all nvcr.io/nvidia/cuda:12.9.0-base-ubi8 bash -c \"ldconfig -p | grep libcuda.so.1\"") Expect(err).ToNot(HaveOccurred()) Expect(ldconfigOut).To(ContainSubstring("/usr/lib64")) }) From 39fd15d2735b3df4420358b5da2e927c7c4a0130 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Tue, 13 May 2025 23:18:01 +0200 Subject: [PATCH 2/3] [no-relnote] Use 550 driver in tests Signed-off-by: Evan Lezar --- tests/e2e/infra/aws.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/e2e/infra/aws.yaml b/tests/e2e/infra/aws.yaml index d73bf7f5..b512fc78 100644 --- a/tests/e2e/infra/aws.yaml +++ b/tests/e2e/infra/aws.yaml @@ -28,3 +28,4 @@ spec: install: false nvidiaDriver: install: true + branch: 550 From 5a1b4e7c1e88d9492f82588ac6da1890f2385a4b Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 18 Jun 2025 15:22:08 +0200 Subject: [PATCH 3/3] [no-relnote] Fix tests for compat mode Signed-off-by: Evan Lezar --- tests/e2e/nvidia-container-toolkit_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/e2e/nvidia-container-toolkit_test.go b/tests/e2e/nvidia-container-toolkit_test.go index 22028307..f89b79a5 100644 --- a/tests/e2e/nvidia-container-toolkit_test.go +++ b/tests/e2e/nvidia-container-toolkit_test.go @@ -201,19 +201,19 @@ var _ = Describe("docker", Ordered, ContinueOnFailure, func() { It("should work with the nvidia runtime in legacy mode", func(ctx context.Context) { ldconfigOut, _, err := runner.Run("docker run --rm -i -e NVIDIA_DISABLE_REQUIRE=true --runtime=nvidia --gpus all nvcr.io/nvidia/cuda:12.9.0-base-ubi8 bash -c \"ldconfig -p | grep libcuda.so.1\"") Expect(err).ToNot(HaveOccurred()) - Expect(ldconfigOut).To(ContainSubstring("/usr/local/cuda/compat")) + Expect(ldconfigOut).To(ContainSubstring("/usr/local/cuda-12.9/compat/")) }) It("should work with the nvidia runtime in CDI mode", func(ctx context.Context) { ldconfigOut, _, err := runner.Run("docker run --rm -i -e NVIDIA_DISABLE_REQUIRE=true --runtime=nvidia -e NVIDIA_VISIBLE_DEVICES=runtime.nvidia.com/gpu=all nvcr.io/nvidia/cuda:12.9.0-base-ubi8 bash -c \"ldconfig -p | grep libcuda.so.1\"") Expect(err).ToNot(HaveOccurred()) - Expect(ldconfigOut).To(ContainSubstring("/usr/local/cuda/compat")) + Expect(ldconfigOut).To(ContainSubstring("/usr/local/cuda-12.9/compat/")) }) - It("should NOT work with nvidia-container-runtime-hook", func(ctx context.Context) { + It("should work with nvidia-container-runtime-hook", func(ctx context.Context) { ldconfigOut, _, err := runner.Run("docker run --rm -i -e NVIDIA_DISABLE_REQUIRE=true --runtime=runc --gpus all nvcr.io/nvidia/cuda:12.9.0-base-ubi8 bash -c \"ldconfig -p | grep libcuda.so.1\"") Expect(err).ToNot(HaveOccurred()) - Expect(ldconfigOut).To(ContainSubstring("/usr/lib64")) + Expect(ldconfigOut).To(ContainSubstring("/usr/local/cuda-12.9/compat/")) }) })