vendor: update buildkit to v0.18.0-rc1

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

vendor/github.com/moby/buildkit/util/testutil/integration/pins.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package integration
 

vendor/github.com/moby/buildkit/util/testutil/integration/registry.go

@@ -69,7 +69,7 @@ http:
 
 	ctx, cancel := context.WithCancelCause(context.Background())
 	ctx, _ = context.WithTimeoutCause(ctx, 5*time.Second, errors.WithStack(context.DeadlineExceeded))
-	defer cancel(errors.WithStack(context.Canceled))
+	defer func() { cancel(errors.WithStack(context.Canceled)) }()
 	url, err = detectPort(ctx, rc)
 	if err != nil {
 		return "", nil, err

vendor/github.com/moby/buildkit/util/testutil/integration/run.go

@@ -198,7 +198,7 @@ func Run(t *testing.T, testCases []Test, opt ...TestOpt) {
 						defer sandboxLimiter.Release(1)
 
 						ctx, cancel := context.WithCancelCause(ctx)
-						defer cancel(errors.WithStack(context.Canceled))
+						defer func() { cancel(errors.WithStack(context.Canceled)) }()
 
 						sb, closer, err := newSandbox(ctx, br, getMirror(), mv)
 						require.NoError(t, err)
@@ -427,7 +427,16 @@ func prepareValueMatrix(tc testConf) []matrixValue {
 
 // Skips tests on platform
 func SkipOnPlatform(t *testing.T, goos string) {
-	if runtime.GOOS == goos {
+	skip := false
+	// support for negation
+	if strings.HasPrefix(goos, "!") {
+		goos = strings.TrimPrefix(goos, "!")
+		skip = runtime.GOOS != goos
+	} else {
+		skip = runtime.GOOS == goos
+	}
+
+	if skip {
 		t.Skipf("Skipped on %s", goos)
 	}
 }

vendor/github.com/moby/buildkit/util/testutil/integration/run_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package integration
 

vendor/github.com/moby/buildkit/util/testutil/integration/util_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package integration
 

vendor/github.com/moby/buildkit/util/testutil/workers/containerd.go

@@ -135,11 +135,12 @@ func (c *Containerd) New(ctx context.Context, cfg *integration.BackendConfig) (b
 	deferF.Append(func() error { return os.RemoveAll(tmpdir) })
 
 	address := getContainerdSock(tmpdir)
-	config := fmt.Sprintf(`root = %q
+	config := fmt.Sprintf(`version = 2
+root = %q
 state = %q
 # CRI plugins listens on 10010/tcp for stream server.
 # We disable CRI plugin so that multiple instance can run simultaneously.
-disabled_plugins = ["cri"]
+disabled_plugins = ["io.containerd.grpc.v1.cri"]
 
 [grpc]
   address = %q

vendor/github.com/moby/buildkit/util/testutil/workers/oci_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package workers
 

vendor/github.com/moby/buildkit/util/testutil/workers/util_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package workers