Skip to content

Commit de72e32

Browse files
committed
Don't specify defaults
Signed-off-by: Evan Lezar <[email protected]>
1 parent 014d91b commit de72e32

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
@@ -183,7 +183,7 @@ var _ = Describe("containerd", Ordered, ContinueOnFailure, Label("container-runt
183183
When("configuring containerd", func() {
184184
It("should add NVIDIA runtime using drop-in config without modifying the main config", func(ctx context.Context) {
185185
// Configure containerd using nvidia-ctk
186-
_, _, 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`)
186+
_, _, err := nestedContainerRunner.Run(`nvidia-ctk runtime configure --runtime=containerd --set-as-default --cdi.enabled`)
187187
Expect(err).ToNot(HaveOccurred(), "Failed to configure containerd")
188188

189189
topLevelConfigContents, _, err := nestedContainerRunner.Run("cat /etc/containerd/config.toml")
@@ -324,7 +324,7 @@ EOF
324324

325325
It("should preserve kata as default when --set-as-default=false", func(ctx context.Context) {
326326
// Configure without setting as default
327-
_, _, 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`)
327+
_, _, err := nestedContainerRunner.Run(`nvidia-ctk runtime configure --runtime=containerd --config-source=file --set-as-default=false --cdi.enabled`)
328328
Expect(err).ToNot(HaveOccurred(), "Failed to configure containerd")
329329

330330
// Restart containerd
@@ -348,7 +348,7 @@ EOF
348348

349349
It("should set nvidia as default when --set-as-default=true", func(ctx context.Context) {
350350
// Configure with nvidia as default
351-
_, _, 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`)
351+
_, _, err := nestedContainerRunner.Run(`nvidia-ctk runtime configure --runtime=containerd --config-source=file --set-as-default --cdi.enabled`)
352352
Expect(err).ToNot(HaveOccurred(), "Failed to configure containerd")
353353

354354
// Restart containerd
@@ -400,7 +400,7 @@ EOF
400400
Expect(err).ToNot(HaveOccurred())
401401

402402
// Configure containerd using nvidia-ctk
403-
_, _, 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`)
403+
_, _, err = nestedContainerRunner.Run(`nvidia-ctk runtime configure --runtime=containerd --cdi.enabled`)
404404
Expect(err).ToNot(HaveOccurred(), "Failed to configure containerd")
405405

406406
// Verify the drop-in config uses v3 format
@@ -503,7 +503,7 @@ EOF
503503
Expect(err).ToNot(HaveOccurred())
504504

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

509509
// Restart containerd to load the new configuration

0 commit comments

Comments
 (0)