[no-relnote] Add test to check CDI injection by default

Now that the NVIDIA Container Toolkit uses CDI injection by default.
This does not trigger the code in the nvidia-container-cli that creates the empty files on the host.

Signed-off-by: Carlos Eduardo Arango Gutierrez <[email protected]>

Author: ArangoGutierrez

tests/e2e/nvidia-container-toolkit_test.go

@@ -240,6 +240,22 @@ var _ = Describe("docker", Ordered, ContinueOnFailure, func() {
 		BeforeAll(func(ctx context.Context) {
 			_, _, err := runner.Run("docker pull ubuntu")
 			Expect(err).ToNot(HaveOccurred())
+
+			err = buildDockerImage(
+				runner,
+				"firmware-test",
+				map[string]string{
+					"RM_VERSION":  "$(basename $(ls -d /lib/firmware/nvidia/*.*))",
+					"CURRENT_DIR": "$(pwd)",
+				}, `
+FROM ubuntu
+RUN mkdir -p /lib/firmware/nvidia/
+ARG RM_VERSION
+ARG CURRENT_DIR
+RUN ln -s /../../../../../../../../$CURRENT_DIR /lib/firmware/nvidia/$RM_VERSION
+`,
+			)
+			Expect(err).ToNot(HaveOccurred())
 		})
 
 		It("should include libcuda.so in the ldcache", func(ctx context.Context) {
@@ -256,5 +272,14 @@ var _ = Describe("docker", Ordered, ContinueOnFailure, func() {
 
 			Expect(libs).To(ContainElements([]string{"libcuda.so", "libcuda.so.1"}))
 		})
+
+		It("should not attempt to create empty firmware files", func(ctx context.Context) {
+			_, _, err := runner.Run("docker run --rm --runtime=nvidia --gpus=all firmware-test")
+			Expect(err).To(HaveOccurred())
+
+			containerOutput, _, err := runner.Run("docker run --rm --runtime=runc --gpus=all firmware-test")
+			Expect(err).ToNot(HaveOccurred())
+			Expect(containerOutput).To(BeEmpty())
+		})
 	})
 })

tests/e2e/runner.go

@@ -169,3 +169,15 @@ func connectOrDie(sshKey, sshUser, host, port string) (*ssh.Client, error) {
 
 	return client, nil
 }
+
+func buildDockerImage(runner Runner, tag string, args map[string]string, dockerfile string) error {
+	var buildArgs string
+	for k, v := range args {
+		buildArgs += fmt.Sprintf("--build-arg %s=%q ", k, v)
+	}
+
+	command := fmt.Sprintf("docker build -t %s %s - <<EOF\n%s\nEOF", tag, buildArgs, dockerfile)
+
+	_, _, err := runner.Run(command)
+	return err
+}