Skip to content

Commit 2b67f6b

Browse files
committed
Don't specify defaults
Signed-off-by: Evan Lezar <[email protected]>
1 parent 101a1d4 commit 2b67f6b

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

tests/e2e/nvidia-ctk_containerd_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ var _ = Describe("containerd", Ordered, ContinueOnFailure, Label("container-runt
199199
When("configuring containerd", func() {
200200
It("should add NVIDIA runtime using drop-in config without modifying the main config", func(ctx context.Context) {
201201
// Configure containerd using nvidia-ctk
202-
_, _, err := nestedContainerRunner.Run(`nvidia-ctk runtime configure --runtime=containerd --config=/etc/containerd/config.toml --drop-in-config=/etc/containerd/conf.d/99-nvidia.toml --set-as-default --cdi.enabled`)
202+
_, _, err := nestedContainerRunner.Run(`nvidia-ctk runtime configure --runtime=containerd --set-as-default --cdi.enabled`)
203203
Expect(err).ToNot(HaveOccurred(), "Failed to configure containerd")
204204

205205
topLevelConfigContents, _, err := nestedContainerRunner.Run("cat /etc/containerd/config.toml")
@@ -340,7 +340,7 @@ EOF
340340

341341
It("should preserve kata as default when --set-as-default=false", func(ctx context.Context) {
342342
// Configure without setting as default
343-
_, _, err := nestedContainerRunner.Run(`nvidia-ctk runtime configure --runtime=containerd --config=/etc/containerd/config.toml --drop-in-config=/etc/containerd/conf.d/99-nvidia.toml --config-source=file --set-as-default=false --cdi.enabled`)
343+
_, _, err := nestedContainerRunner.Run(`nvidia-ctk runtime configure --runtime=containerd --config-source=file --set-as-default=false --cdi.enabled`)
344344
Expect(err).ToNot(HaveOccurred(), "Failed to configure containerd")
345345

346346
// Restart containerd
@@ -364,7 +364,7 @@ EOF
364364

365365
It("should set nvidia as default when --set-as-default=true", func(ctx context.Context) {
366366
// Configure with nvidia as default
367-
_, _, err := nestedContainerRunner.Run(`nvidia-ctk runtime configure --runtime=containerd --config=/etc/containerd/config.toml --drop-in-config=/etc/containerd/conf.d/99-nvidia.toml --config-source=file --set-as-default --cdi.enabled`)
367+
_, _, err := nestedContainerRunner.Run(`nvidia-ctk runtime configure --runtime=containerd --config-source=file --set-as-default --cdi.enabled`)
368368
Expect(err).ToNot(HaveOccurred(), "Failed to configure containerd")
369369

370370
// Restart containerd
@@ -416,7 +416,7 @@ EOF
416416
Expect(err).ToNot(HaveOccurred())
417417

418418
// Configure containerd using nvidia-ctk
419-
_, _, err = nestedContainerRunner.Run(`nvidia-ctk runtime configure --runtime=containerd --config=/etc/containerd/config.toml --drop-in-config=/etc/containerd/conf.d/99-nvidia.toml --cdi.enabled`)
419+
_, _, err = nestedContainerRunner.Run(`nvidia-ctk runtime configure --runtime=containerd --cdi.enabled`)
420420
Expect(err).ToNot(HaveOccurred(), "Failed to configure containerd")
421421

422422
// Verify the drop-in config uses v3 format
@@ -519,7 +519,7 @@ EOF
519519
Expect(err).ToNot(HaveOccurred())
520520

521521
// Configure containerd using nvidia-ctk
522-
_, _, err = nestedContainerRunner.Run(`nvidia-ctk runtime configure --runtime=containerd --config=/etc/containerd/config.toml --drop-in-config=/etc/containerd/conf.d/99-nvidia.toml`)
522+
_, _, err = nestedContainerRunner.Run(`nvidia-ctk runtime configure --runtime=containerd`)
523523
Expect(err).ToNot(HaveOccurred(), "Failed to configure containerd")
524524

525525
// Restart containerd to load the new configuration

0 commit comments

Comments
 (0)