From 4187775c0a2c50fa141c086390dcd459532973b9 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Sun, 10 Mar 2019 21:04:50 -0700 Subject: [PATCH] integration: disable gc Signed-off-by: Tonis Tiigi --- util/testutil/integration/containerd.go | 1 + util/testutil/integration/oci.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/util/testutil/integration/containerd.go b/util/testutil/integration/containerd.go index e75b9c4e97d1..7751830c6993 100644 --- 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 index a22af37293aa..c06ff053fd61 100644 --- 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{}