Merge pull request #861 from tonistiigi/disable-gc

integration: disable gc
moby · Mar 18, 2019 · 0c747f4 · 0c747f4
2 parents 6bc2b82 + aece2ac
commit 0c747f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/util/testutil/integration/containerd.go b/util/testutil/integration/containerd.go
@@ -123,6 +123,7 @@ disabled_plugins = ["cri"]
 
 	buildkitdArgs := []string{"buildkitd",
 		"--oci-worker=false",
+		"--containerd-worker-gc=false",
 		"--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

diff --git a/util/testutil/integration/oci.go b/util/testutil/integration/oci.go
@@ -60,7 +60,7 @@ func (s *oci) New(opt ...SandboxOpt) (Sandbox, func() error, error) {
 	}
 	logs := map[string]*bytes.Buffer{}
 	// Include use of --oci-worker-labels to trigger https://github.com/moby/buildkit/pull/603
-	buildkitdArgs := []string{"buildkitd", "--oci-worker=true", "--containerd-worker=false", "--oci-worker-labels=org.mobyproject.buildkit.worker.sandbox=true"}
+	buildkitdArgs := []string{"buildkitd", "--oci-worker=true", "--containerd-worker=false", "--oci-worker-gc=false", "--oci-worker-labels=org.mobyproject.buildkit.worker.sandbox=true"}
 
 	deferF := &multiCloser{}