From 2d02abae666c64e2523c83aabf762cce473636cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Thu, 22 Apr 2021 07:57:52 +0200
Subject: [PATCH] Make sure to start buildkit socket for containerd

---
 test/integration/image_test.go | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/test/integration/image_test.go b/test/integration/image_test.go
index 4bd6ceab1968..5bca91314f2a 100644
--- a/test/integration/image_test.go
+++ b/test/integration/image_test.go
@@ -37,6 +37,17 @@ func TestImage(t *testing.T) {
 		t.Fatalf("starting minikube: %v\n%s", err, rr.Output())
 	}
 
+	if ContainerRuntime() == "containerd" {
+		// sudo systemctl start buildkit.socket
+		cmd := exec.CommandContext(ctx, Target(), "ssh", "-p", profile, "--", "nohup",
+			"sudo", "-b", "buildkitd", "--oci-worker=false",
+			"--containerd-worker=true", "--containerd-worker-namespace=k8s.io")
+		if rr, err = Run(t, cmd); err != nil {
+			t.Fatalf("%s failed: %v", rr.Command(), err)
+		}
+		// unix:///run/buildkit/buildkitd.sock
+        }
+
 	tests := []struct {
 		command string
 		args    []string