testutil: set cdi spec dir with config

Signed-off-by: CrazyMax <[email protected]>

Author: crazy-max

util/testutil/workers/containerd.go

@@ -212,7 +212,6 @@ disabled_plugins = ["io.containerd.grpc.v1.cri"]
 		"--containerd-worker=true",
 		"--containerd-worker-addr", address,
 		"--containerd-worker-labels=org.mobyproject.buildkit.worker.sandbox=true", // Include use of --containerd-worker-labels to trigger https://github.com/moby/buildkit/pull/603
-		"--cdi-spec-dir=" + cfg.CDISpecDir,
 	}
 	buildkitdArgs = applyBuildkitdPlatformFlags(buildkitdArgs)
 	buildkitdArgs = append(buildkitdArgs, snBuildkitdArgs...)

util/testutil/workers/oci.go

@@ -52,7 +52,6 @@ func (s *OCI) New(ctx context.Context, cfg *integration.BackendConfig) (integrat
 		"--containerd-worker=false",
 		"--oci-worker-gc=false",
 		"--oci-worker-labels=org.mobyproject.buildkit.worker.sandbox=true",
-		"--cdi-spec-dir=" + cfg.CDISpecDir,
 	}
 
 	if s.Snapshotter != "" {

util/testutil/workers/util.go

@@ -25,6 +25,20 @@ func (osp otelSocketPath) UpdateConfigFile(in string) string {
 `, in, osp)
 }
 
+func withCDISpecDir(specDir string) integration.ConfigUpdater {
+	return cdiSpecDir(specDir)
+}
+
+type cdiSpecDir string
+
+func (csd cdiSpecDir) UpdateConfigFile(in string) string {
+	return fmt.Sprintf(`%s
+
+[cdi]
+  specDirs = [%q]
+`, in, csd)
+}
+
 func runBuildkitd(
 	conf *integration.BackendConfig,
 	args []string,
@@ -61,7 +75,11 @@ func runBuildkitd(
 	deferF.Append(func() error { return os.RemoveAll(tmpdir) })
 
 	cfgfile, err := integration.WriteConfig(
-		append(conf.DaemonConfig, withOTELSocketPath(getTraceSocketPath(tmpdir))))
+		append(conf.DaemonConfig,
+			withOTELSocketPath(getTraceSocketPath(tmpdir)),
+			withCDISpecDir(conf.CDISpecDir),
+		),
+	)
 	if err != nil {
 		return "", "", nil, err
 	}