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

Fix integration tests failing due to CDI spec generation

See merge request nvidia/container-toolkit/container-toolkit!333

build/container/Makefile

@@ -50,7 +50,7 @@ META_TARGETS := packaging
 
 BUILD_TARGETS := $(patsubst %,build-%,$(DISTRIBUTIONS) $(META_TARGETS))
 PUSH_TARGETS := $(patsubst %,push-%,$(DISTRIBUTIONS) $(META_TARGETS))
-TEST_TARGETS := $(patsubst %,test-%, $(DISTRIBUTIONS))
+TEST_TARGETS := $(patsubst %,test-%,$(DISTRIBUTIONS))
 
 .PHONY: $(DISTRIBUTIONS) $(PUSH_TARGETS) $(BUILD_TARGETS) $(TEST_TARGETS)
 

test/container/containerd_test.sh

@@ -52,8 +52,9 @@ testing::containerd::toolkit::run() {
 		--volumes-from "${containerd_dind_ctr}" \
 		-v "${shared_dir}/etc/containerd/config_${version}.toml:${containerd_dind_containerd_dir}/containerd.toml" \
 		--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 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"
 

test/container/docker_test.sh

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

tools/container/toolkit/toolkit.go

@@ -168,12 +168,14 @@ func main() {
 			Usage:       "the directory where the CDI output files are to be written. If this is set to '', no CDI specification is generated.",
 			Value:       "/var/run/cdi",
 			Destination: &opts.cdiOutputDir,
+			EnvVars:     []string{"CDI_OUTPUT_DIR"},
 		},
 		&cli.StringFlag{
 			Name:        "cdi-kind",
 			Usage:       "the vendor string to use for the generated CDI specification",
 			Value:       "management.nvidia.com/gpu",
 			Destination: &opts.cdiKind,
+			EnvVars:     []string{"CDI_KIND"},
 		},
 	}