close
Skip to content

util: testutil: enable dockerd-containerd worker for wcow integration tests#5956

Merged
tonistiigi merged 1 commit into
moby:masterfrom
profnandaa:tests-enable-dockerd-worker
May 6, 2025
Merged

util: testutil: enable dockerd-containerd worker for wcow integration tests#5956
tonistiigi merged 1 commit into
moby:masterfrom
profnandaa:tests-enable-dockerd-worker

Conversation

@profnandaa
Copy link
Copy Markdown
Collaborator

@profnandaa profnandaa commented May 5, 2025 •
edited
Loading

Currently, dockerd and dockerd-containerd integration tests are only ran for Linux at [moby/moby] .github/workflows/buildkit.yml

moby/moby runs this workflow against feature buildkit releases as evaluated by ./hack/buidkit-ref.

This change facilitates adding support for Windows, see example run here [1], and updated workflow file here [2].

Work to integrate buildkit on Docker Engine is ongoing here [3], and this integration tests are part of what's needed to complete.

[1] https://github.com/profnandaa/moby/actions/runs/14811696298
[2] https://github.com/profnandaa/moby/blob/c9d2649f4ddb86f8f68dd3e56f358537c4d2b8f3/.github/workflows/buildkit.yml#L266-L381
[3] moby/moby#49740

@profnandaa profnandaa force-pushed the tests-enable-dockerd-worker branch from 2ffb8f9 to 4c654c0 Compare May 5, 2025 04:52
@profnandaa profnandaa changed the title util: testutil: enable dockerd worker for windows integration tests util: testutil: enable dockerd-containerd worker for wcow integration tests May 5, 2025
@profnandaa profnandaa changed the title util: testutil: enable dockerd-containerd worker for wcow integration tests util: testutil: enable dockerd-containerd worker for wcow integration tests May 5, 2025
profnandaa added a commit to profnandaa/moby that referenced this pull request May 5, 2025
@profnandaa
builder-next: add buildkit executor for wcow
66bcaf1 
WCOW support on Buildkit is now coming to maturity. As part
of making this generally available, integrating it in
Docker Engine is critical for it's adoption.

This commit adds the buildkit execuitor for WCOW as the
next-builder (backend) for building Windows containers.

This will be an opt-in feature, with the end users setting
DOCKER_BUILDKIT=1 environment variable to use it.

The integration tests bit has also been handled. As we
wait merging of moby/buildkit#5956,
I have set the ref to PR's branch, so that the tests can
execute correctly. Once this is merged, will set to
`moby/buildkit:master`.

ASIDE:
As I have also mentioned in the other PR, we will need to
revisit the logic for getting appropriate ref to run the
tests against. We currently pick the latest feature release,
while we also vendor patch releases for buildkit.

Signed-off-by: Anthony Nandaa <profnandaa@gmail.com>
@profnandaa profnandaa mentioned this pull request May 5, 2025
Merged
profnandaa added a commit to profnandaa/moby that referenced this pull request May 5, 2025
@profnandaa
builder-next: add buildkit executor for wcow
5fa90b3 
WCOW support on Buildkit is now coming to maturity. As part
of making this generally available, integrating it in
Docker Engine is critical for it's adoption.

This commit adds the buildkit execuitor for WCOW as the
next-builder (backend) for building Windows containers.

This will be an opt-in feature, with the end users setting
DOCKER_BUILDKIT=1 environment variable to use it.

The integration tests bit has also been handled. As we
wait merging of moby/buildkit#5956,
I have set the ref to PR's branch, so that the tests can
execute correctly. Once this is merged, will set to
`moby/buildkit:master`.

ASIDE:
As I have also mentioned in the other PR, we will need to
revisit the logic for getting appropriate ref to run the
tests against. We currently pick the latest feature release,
while we also vendor patch releases for buildkit.

Signed-off-by: Anthony Nandaa <profnandaa@gmail.com>
@profnandaa profnandaa force-pushed the tests-enable-dockerd-worker branch from 4c654c0 to 9efa357 Compare May 5, 2025 06:44
@profnandaa
util: testutil: enable dockerd-containerd worker for wcow
f1f804d 
Currently, dockerd and dockerd-containerd integration tests are only ran
for Linux at [moby/moby] `.github/workflows/buildkit.yml`

moby/moby runs this workflow against feature buildkit releases as
evaluated by `./hack/buidkit-ref` (this might need to be revisited
since we still vendor patch releases like here [3]).

This change facilitates adding support for Windows, see example run here
[1], and updated workflow file here [2].

Work to integrate buildkit on Docker Engine is ongoing here [4], and
this integration tests are part of what's needed to complete.

[1] https://github.com/profnandaa/moby/actions/runs/14811696298
[2] https://github.com/profnandaa/moby/blob/c9d2649f4ddb86f8f68dd3e56f358537c4d2b8f3/.github/workflows/buildkit.yml#L266-L381
[3] moby/moby@9aa66be
[4] moby/moby#49740

Signed-off-by: Anthony Nandaa <profnandaa@gmail.com>
@profnandaa profnandaa force-pushed the tests-enable-dockerd-worker branch from 9efa357 to f1f804d Compare May 6, 2025 06:37
@tonistiigi tonistiigi merged commit 3bee376 into moby:master May 6, 2025
111 checks passed
profnandaa added a commit to profnandaa/moby that referenced this pull request May 6, 2025
@profnandaa
builder-next: add buildkit executor for wcow
3bb4024 
WCOW support on Buildkit is now coming to maturity. As part
of making this generally available, integrating it in
Docker Engine is critical for it's adoption.

This commit adds the buildkit execuitor for WCOW as the
next-builder (backend) for building Windows containers.

This will be an opt-in feature, with the end users setting
DOCKER_BUILDKIT=1 environment variable to use it.

The integration tests bit has also been handled.
moby/buildkit#5956,
BUILDKIT_REF has been set to `master` for now, so
that the tests can run successfully. On the next
release, we will revert this back to using releases.

Signed-off-by: Anthony Nandaa <profnandaa@gmail.com>
@profnandaa profnandaa deleted the tests-enable-dockerd-worker branch May 6, 2025 17:01
profnandaa added a commit to profnandaa/moby that referenced this pull request May 19, 2025
@profnandaa
builder-next: add buildkit executor for wcow
1ea11ff 
WCOW support on Buildkit is now coming to maturity. As part
of making this generally available, integrating it in
Docker Engine is critical for it's adoption.

This commit adds the buildkit execuitor for WCOW as the
next-builder (backend) for building Windows containers.

This will be an opt-in feature, with the end users setting
DOCKER_BUILDKIT=1 environment variable to use it.

The integration tests bit has also been handled.
moby/buildkit#5956,
BUILDKIT_REF has been set to `master` for now, so
that the tests can run successfully. On the next
release, we will revert this back to using releases.

Signed-off-by: Anthony Nandaa <profnandaa@gmail.com>
profnandaa added a commit to profnandaa/moby that referenced this pull request May 19, 2025
@profnandaa
builder-next: add buildkit executor for wcow
a901744 
WCOW support on Buildkit is now coming to maturity. As part
of making this generally available, integrating it in
Docker Engine is critical for it's adoption.

This commit adds the buildkit execuitor for WCOW as the
next-builder (backend) for building Windows containers.

This will be an opt-in feature, with the end users setting
DOCKER_BUILDKIT=1 environment variable to use it.

The integration tests bit has also been handled.
moby/buildkit#5956,
BUILDKIT_REF has been set to `master` for now, so
that the tests can run successfully. On the next
release, we will revert this back to using releases.

Signed-off-by: Anthony Nandaa <profnandaa@gmail.com>
profnandaa added a commit to profnandaa/moby that referenced this pull request May 19, 2025
@profnandaa
builder-next: add buildkit executor for wcow
d451740 
WCOW support on Buildkit is now coming to maturity. As part
of making this generally available, integrating it in
Docker Engine is critical for it's adoption.

This commit adds the buildkit execuitor for WCOW as the
next-builder (backend) for building Windows containers.

This will be an opt-in feature, with the end users setting
DOCKER_BUILDKIT=1 environment variable to use it.

The integration tests bit has also been handled.
moby/buildkit#5956,
BUILDKIT_REF has been set to `master` for now, so
that the tests can run successfully. On the next
release, we will revert this back to using releases.

Signed-off-by: Anthony Nandaa <profnandaa@gmail.com>
profnandaa added a commit to profnandaa/moby that referenced this pull request May 19, 2025
@profnandaa
builder-next: add buildkit executor for wcow
a9ec07a 
WCOW support on Buildkit is now coming to maturity. As part
of making this generally available, integrating it in
Docker Engine is critical for it's adoption.

This commit adds the buildkit execuitor for WCOW as the
next-builder (backend) for building Windows containers.

This will be an opt-in feature, with the end users setting
DOCKER_BUILDKIT=1 environment variable to use it.

The integration tests bit has also been handled.
moby/buildkit#5956,
BUILDKIT_REF has been set to `master` for now, so
that the tests can run successfully. On the next
release, we will revert this back to using releases.

Signed-off-by: Anthony Nandaa <profnandaa@gmail.com>
yusing pushed a commit to godoxy-app/docker that referenced this pull request May 23, 2025
@profnandaa
builder-next: add buildkit executor for wcow
c633708 
WCOW support on Buildkit is now coming to maturity. As part
of making this generally available, integrating it in
Docker Engine is critical for it's adoption.

This commit adds the buildkit execuitor for WCOW as the
next-builder (backend) for building Windows containers.

This will be an opt-in feature, with the end users setting
DOCKER_BUILDKIT=1 environment variable to use it.

The integration tests bit has also been handled.
moby/buildkit#5956,
BUILDKIT_REF has been set to `master` for now, so
that the tests can run successfully. On the next
release, we will revert this back to using releases.

Signed-off-by: Anthony Nandaa <profnandaa@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tonistiigi tonistiigi tonistiigi approved these changes

+1 more reviewer

@billywr billywr billywr approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area/util area/windows

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@profnandaa @tonistiigi @billywr