Skip to content

[23.0 backport] builder-next: temporarily disable mergeop and diffop #45112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neersighted merged 2 commits into from
Mar 16, 2023
+17 −1
Merged

[23.0 backport] builder-next: temporarily disable mergeop and diffop #45112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d43958b
builder-next: disable mergeop and diffop
tonistiigi Mar 6, 2023
1363b3e
ci: disable testing mergeop and diffop with the dockerd worker
neersighted Mar 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/buildkit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,5 +106,6 @@ jobs:
TEST_DOCKERD: "1"
TEST_DOCKERD_BINARY: "./build/moby/dockerd"
TESTPKGS: "./${{ matrix.pkg }}"
TESTFLAGS: "-v --parallel=1 --timeout=30m --run=//worker=dockerd$"
# Diff/MergeOp tests are skipped
TESTFLAGS: "-v --parallel=1 --timeout=30m --run=/^Test([^DM]|.[^ie]|..[^fr]|...[^fg])/worker=dockerd$"
Comment thread
neersighted marked this conversation as resolved.
working-directory: buildkit
15 changes: 15 additions & 0 deletions builder/builder-next/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ import (
"github.com/moby/buildkit/worker"
"github.com/pkg/errors"
bolt "go.etcd.io/bbolt"

"github.com/moby/buildkit/solver/pb"
"github.com/moby/buildkit/util/apicaps"
)

func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
Expand All @@ -49,6 +52,18 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
dist := opt.Dist
root := opt.Root

pb.Caps.Init(apicaps.Cap{
ID: pb.CapMergeOp,
Enabled: false,
DisabledReasonMsg: "only enabled with containerd image store backend",
})

pb.Caps.Init(apicaps.Cap{
ID: pb.CapDiffOp,
Enabled: false,
DisabledReasonMsg: "only enabled with containerd image store backend",
})

var driver graphdriver.Driver
if ls, ok := dist.LayerStore.(interface {
Driver() graphdriver.Driver
Expand Down