docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-21 11:17:44 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

tests: share single docker between docker-container backends

Browse Source 
This means that we can run our docker-container tests in parallel again,
which can help speed up our test runs by a *significant* amount.

Signed-off-by: Justin Chadwell <me@jedevc.com>
(cherry picked from commit 601056f3a719a0fa4d437d07a7214bda9ba25e95)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Justin Chadwell 2023-06-16 11:34:55 +01:00 committed by Sebastiaan van Stijn
parent 0424ae14c0
commit 5657006c1f
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tests/workers/docker-container.go
View File

@ -4,6 +4,7 @@ import (
"context" "context"
"os" "os"
"os/exec" "os/exec"
"sync"
"github.com/moby/buildkit/identity" "github.com/moby/buildkit/identity"
"github.com/moby/buildkit/util/testutil/integration" "github.com/moby/buildkit/util/testutil/integration"
@ -18,6 +19,11 @@ func InitDockerContainerWorker() {
type containerWorker struct { type containerWorker struct {
id string id string
docker integration.Backend
dockerClose func() error
dockerErr error
dockerOnce sync.Once
} }
func (w *containerWorker) Name() string { func (w *containerWorker) Name() string {
@ -29,9 +35,11 @@ func (w *containerWorker) Rootless() bool {
} }
func (w *containerWorker) New(ctx context.Context, cfg *integration.BackendConfig) (integration.Backend, func() error, error) { func (w *containerWorker) New(ctx context.Context, cfg *integration.BackendConfig) (integration.Backend, func() error, error) {
bk, bkclose, err := dockerWorker{id: w.id}.New(ctx, cfg) w.dockerOnce.Do(func() {
if err != nil { w.docker, w.dockerClose, w.dockerErr = dockerWorker{id: w.id}.New(ctx, cfg)
return bk, bkclose, err })
if w.dockerErr != nil {
return w.docker, w.dockerClose, w.dockerErr
} }
name := "integration-container-" + identity.NewID() name := "integration-container-" + identity.NewID()
@ -42,29 +50,32 @@ func (w *containerWorker) New(ctx context.Context, cfg *integration.BackendConfi
"--driver=docker-container", "--driver=docker-container",
"--driver-opt=network=host", "--driver-opt=network=host",
) )
cmd.Env = append(os.Environ(), "DOCKER_CONTEXT="+bk.DockerAddress()) cmd.Env = append(os.Environ(), "DOCKER_CONTEXT="+w.docker.DockerAddress())
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
return nil, nil, errors.Wrapf(err, "failed to create buildx instance %s", name) return nil, nil, errors.Wrapf(err, "failed to create buildx instance %s", name)
} }
cl := func() error { cl := func() error {
var err error
if err1 := bkclose(); err == nil {
err = err1
}
cmd := exec.Command("buildx", "rm", "-f", name) cmd := exec.Command("buildx", "rm", "-f", name)
if err1 := cmd.Run(); err == nil { return cmd.Run()
err = err1
}
return err
} }
return &backend{ return &backend{
context: bk.DockerAddress(), context: w.docker.DockerAddress(),
builder: name, builder: name,
}, cl, nil }, cl, nil
} }
func (w *containerWorker) Close() error { func (w *containerWorker) Close() error {
if close := w.dockerClose; close != nil {
return close()
}
// reset the worker to be ready to go again
w.docker = nil
w.dockerClose = nil
w.dockerErr = nil
w.dockerOnce = sync.Once{}
return nil return nil
} }

2
tests/workers/docker.go
View File

@ -42,7 +42,7 @@ func (c dockerWorker) New(ctx context.Context, cfg *integration.BackendConfig) (
"--docker", "host="+bk.DockerAddress(), "--docker", "host="+bk.DockerAddress(),
) )
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
return nil, cl, errors.Wrapf(err, "failed to create buildx instance %s", name) return bk, cl, errors.Wrapf(err, "failed to create buildx instance %s", name)
} }
cl = func() error { cl = func() error {