The change is targeted to the graphdrivers as it's in newGraphDriverController -- as I understand it, mergeop and diffop are broken with the graphdriver backend until 0.12.x. If that's the case, there's a strong preference to accept a change on master first, even if it's immediately replaced with a better solution, to better understand the divergence of a previous branch and the development branch, and greatly reduce the chance a fix is ever missed.

Looks like Ci is failing on master (perhaps differences between v0.10 and v0.11 of BuildKit and/or other changes)

Merge/diff should be enabled when containerd is enabled. The ugly regexp can be avoided with some buildkit refactoring.

Will be sorted with moby/buildkit#3711 hopefully. Will look like this in the workflow:

      -
        name: Test
        run: |
          ./hack/test ${{ matrix.typ }}
        env:
          CONTEXT: "."
          TEST_DOCKERD: "1"
          TEST_DOCKERD_BINARY: "./build/moby/dockerd"
          TESTPKGS: "./${{ matrix.pkg }}"
          TESTFLAGS: "-v --parallel=1 --timeout=30m --run=//worker=dockerd$"
          BUILDKIT_TEST_FEATURE_MERGEDIFF: "0"
        working-directory: buildkit

Looks like Ci is failing on master (perhaps differences between v0.10 and v0.11 of BuildKit and/or other changes)

Yeah, that's a new test that didn't exist in v0.11.

@neersighted looks like this one can be updated with changes from #45165 to help with CI (to skip tests)

I've rebased on master and taken the solution from #45165; I'm updating #45112 next.