tests: set a dedicated buildx config dir for each worker

jedevc · jedevc · commit 6f394a06919a · 2023-06-20T12:40:45.000+01:00
This should help reduce any unexpected config conflict between workers.

Signed-off-by: Justin Chadwell &lt;me@jedevc.com&gt;
diff --git a/tests/integration.go b/tests/integration.go
@@ -47,6 +47,7 @@ func buildxCmd(sb integration.Sandbox, opts ...cmdOpt) *exec.Cmd {
 
 	if builder := sb.Address(); builder != "" {
 		cmd.Args = append(cmd.Args, "--builder="+builder)
+		cmd.Env = append(cmd.Env, "BUILDX_CONFIG=/tmp/buildx-"+builder)
 	}
 	if context := sb.DockerAddress(); context != "" {
 		cmd.Env = append(cmd.Env, "DOCKER_CONTEXT="+context)
diff --git a/tests/workers/docker-container.go b/tests/workers/docker-container.go
@@ -50,7 +50,11 @@ func (w *containerWorker) New(ctx context.Context, cfg *integration.BackendConfi
 		"--driver=docker-container",
 		"--driver-opt=network=host",
 	)
-	cmd.Env = append(os.Environ(), "DOCKER_CONTEXT="+w.docker.DockerAddress())
+	cmd.Env = append(
+		os.Environ(),
+		"BUILDX_CONFIG=/tmp/buildx-"+name,
+		"DOCKER_CONTEXT="+w.docker.DockerAddress(),
+	)
 	if err := cmd.Run(); err != nil {
 		return nil, nil, errors.Wrapf(err, "failed to create buildx instance %s", name)
 	}
diff --git a/tests/workers/docker.go b/tests/workers/docker.go
@@ -2,6 +2,7 @@ package workers
 
 import (
 	"context"
+	"os"
 	"os/exec"
 
 	"github.com/moby/buildkit/identity"
@@ -41,6 +42,7 @@ func (c dockerWorker) New(ctx context.Context, cfg *integration.BackendConfig) (
 		name,
 		"--docker", "host="+bk.DockerAddress(),
 	)
+	cmd.Env = append(os.Environ(), "BUILDX_CONFIG=/tmp/buildx-"+name)
 	if err := cmd.Run(); err != nil {
 		return bk, cl, errors.Wrapf(err, "failed to create buildx instance %s", name)
 	}
diff --git a/tests/workers/remote.go b/tests/workers/remote.go
@@ -2,6 +2,7 @@ package workers
 
 import (
 	"context"
+	"os"
 	"os/exec"
 
 	"github.com/moby/buildkit/identity"
@@ -41,6 +42,7 @@ func (w remoteWorker) New(ctx context.Context, cfg *integration.BackendConfig) (
 		"--driver=remote",
 		bk.Address(),
 	)
+	cmd.Env = append(os.Environ(), "BUILDX_CONFIG=/tmp/buildx-"+name)
 	if err := cmd.Run(); err != nil {
 		return nil, nil, errors.Wrapf(err, "failed to create buildx instance %s", name)
 	}

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ func buildxCmd(sb integration.Sandbox, opts ...cmdOpt) *exec.Cmd {`
`47`	`47`
`48`	`48`	`if builder := sb.Address(); builder != "" {`
`49`	`49`	`cmd.Args = append(cmd.Args, "--builder="+builder)`
	`50`	`+ cmd.Env = append(cmd.Env, "BUILDX_CONFIG=/tmp/buildx-"+builder)`
`50`	`51`	`}`
`51`	`52`	`if context := sb.DockerAddress(); context != "" {`
`52`	`53`	`cmd.Env = append(cmd.Env, "DOCKER_CONTEXT="+context)`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,11 @@ func (w containerWorker) New(ctx context.Context, cfg integration.BackendConfi`
`50`	`50`	`"--driver=docker-container",`
`51`	`51`	`"--driver-opt=network=host",`
`52`	`52`	`)`
`53`		`- cmd.Env = append(os.Environ(), "DOCKER_CONTEXT="+w.docker.DockerAddress())`
	`53`	`+ cmd.Env = append(`
	`54`	`+ os.Environ(),`
	`55`	`+ "BUILDX_CONFIG=/tmp/buildx-"+name,`
	`56`	`+ "DOCKER_CONTEXT="+w.docker.DockerAddress(),`
	`57`	`+ )`
`54`	`58`	`if err := cmd.Run(); err != nil {`
`55`	`59`	`return nil, nil, errors.Wrapf(err, "failed to create buildx instance %s", name)`
`56`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package workers`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
	`5`	`+ "os"`
`5`	`6`	`"os/exec"`
`6`	`7`
`7`	`8`	`"github.com/moby/buildkit/identity"`
`@@ -41,6 +42,7 @@ func (c dockerWorker) New(ctx context.Context, cfg *integration.BackendConfig) (`
`41`	`42`	`name,`
`42`	`43`	`"--docker", "host="+bk.DockerAddress(),`
`43`	`44`	`)`
	`45`	`+ cmd.Env = append(os.Environ(), "BUILDX_CONFIG=/tmp/buildx-"+name)`
`44`	`46`	`if err := cmd.Run(); err != nil {`
`45`	`47`	`return bk, cl, errors.Wrapf(err, "failed to create buildx instance %s", name)`
`46`	`48`	`}`