Skip to content
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.

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

[WIP] testing buildkit 0.12 fixes #46035

Closed
wants to merge 16 commits into from

Conversation

thaJeztah
Copy link
Member

- A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
This is a bit ugly, but it works given the new codegen output.

Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
Introduced in containerd/containerd@dd3eedf

Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
ref was made a return value in moby/buildkit@330cf7a

Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
We still use interface{} for now to reduce code churn.

flightcontrol.Group was made generic in moby/buildkit@8ffc03b

Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
This is a horrible kludge, but not /the worst/ as a reference to the
underlying `osl.Sandbox` is part of the `Sandbox`; so keeping a
reference to the underlying `osl.Interface` in the `Endpoint` is about
the same level of impure.

The lifecycle and assignment here is bad, but that can be fixed during
future refactors, and keeps this diff minimal.

Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
This method was added to the interface in moby/buildkit@963f161

Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
Introduced in moby/buildkit@6e87e4b

Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
The controller moved to CacheManager in moby/buildkit@2b30693

Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
Duration is a deserializing wrapper introduced in moby/buildkit@e06c962

Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
…tore

The concrete types are used instead of the interface after moby/buildkit@f044e0a

Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
Introduced years ago in moby/buildkit@6644e1b

Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
Introduced in moby/buildkit@4fc2d7b

Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
@thaJeztah
Copy link
Member Author

vendor validation will fail on this one, as I manually modified the vendored files

@thaJeztah
Copy link
Member Author

Linter found some issues;

libcontainerd/remote/client.go:212:13: copylocks: assignment copies lock value to opts: github.com/docker/docker/vendor/github.com/containerd/containerd/runtime/v2/runc/options.Options contains github.com/docker/docker/vendor/google.golang.org/protobuf/internal/impl.MessageState contains sync.Mutex (govet)
				opts := *c.v2runcoptions
				        ^
daemon/runtime_unix_test.go:246:17: copylocks: assignment copies lock value to configdOpts: github.com/docker/docker/vendor/github.com/containerd/containerd/runtime/v2/runc/options.Options contains github.com/docker/docker/vendor/google.golang.org/protobuf/internal/impl.MessageState contains sync.Mutex (govet)
	configdOpts := *stockRuntime.Opts.(*v2runcoptions.Options)
	               ^
builder/builder-next/adapters/containerimage/pull.go:22:2: SA1019: "github.com/containerd/containerd/remotes/docker/schema1" is deprecated: use images formatted in Docker Image Manifest v2, Schema 2, or OCI Image Spec v1. (staticcheck)
	"github.com/containerd/containerd/remotes/docker/schema1"
	^

@thaJeztah
Copy link
Member Author

Two flaky test failures;

=== Failed
=== FAIL: github.com/docker/docker/integration/container TestExecWithCloseStdin (6.03s)
    exec_test.go:77: failed to read the content in time

=== FAIL: github.com/docker/docker/integration/container TestRenameStoppedContainer (13.11s)
    rename_test.go:58: timeout hit after 10s: waiting for container to be one of (exited), currently running

Some failures on Windows that I THINK are unrelated, but I'll kick those again after

=== Failed
=== FAIL: github.com/docker/docker/integration-cli TestDockerAPISuite/TestContainersAPICreateMountsCreate/0_config:_{volume__c:\foo_false__<nil>_<nil>_<nil>_<nil>} (12.30s)
    docker_api_containers_test.go:2157: timeout hit after 10s: container d8899eaa18c06679eb8f5d836861b00ce887613d7e29b38a5c79a354f45c4c09 is running, waiting for exit

=== FAIL: github.com/docker/docker/integration-cli TestDockerAPISuite/TestContainersAPICreateMountsCreate/1_config:_{volume__c:\foo\_false__<nil>_<nil>_<nil>_<nil>} (12.18s)
    docker_api_containers_test.go:2157: timeout hit after 10s: container 1f98febef0ed3bba3f2c8cc964dfd56e7af160e3b307c4f90716aaf36b634dd1 is running, waiting for exit

=== FAIL: github.com/docker/docker/integration-cli TestDockerAPISuite/TestContainersAPICreateMountsCreate/2_config:_{volume_test1_c:\foo_false__<nil>_<nil>_<nil>_<nil>} (12.13s)
    docker_api_containers_test.go:2157: timeout hit after 10s: container 2e22f8b3d0229272ca4a581872afaa1f895e88ab681cdf9d2c947db5971dbbd7 is running, waiting for exit

=== FAIL: github.com/docker/docker/integration-cli TestDockerAPISuite/TestContainersAPICreateMountsCreate/3_config:_{volume_test2_c:\foo_true__<nil>_<nil>_<nil>_<nil>} (12.29s)
    docker_api_containers_test.go:2157: timeout hit after 10s: container f7bbe4731a3b4b9e886c8bf256492305c71e91152b228e6fe5fed212dd2fba89 is running, waiting for exit

=== FAIL: github.com/docker/docker/integration-cli TestDockerAPISuite/TestContainersAPICreateMountsCreate/4_config:_{volume_test3_c:\foo_false__<nil>_0xc000cb4018_<nil>_<nil>} (12.15s)
    docker_api_containers_test.go:2157: timeout hit after 10s: container 39cd582a0cbeeaba949d0b92c42bea47660a74a6d4d85286abbe06f40b2fdb2c is running, waiting for exit

=== FAIL: github.com/docker/docker/integration-cli TestDockerAPISuite/TestContainersAPICreateMountsCreate/5_config:_{bind_C:\Users\RUNNER~1\AppData\Local\Temp\test-mounts-api-13699587998_c:\foo_false__<nil>_<nil>_<nil>_<nil>} (12.21s)
    docker_api_containers_test.go:2157: timeout hit after 10s: container d599fca52be8409f25433e5d64957e39a97cc61cd528586e3dd476aade4fd57b is running, waiting for exit

=== FAIL: github.com/docker/docker/integration-cli TestDockerAPISuite/TestContainersAPICreateMountsCreate/6_config:_{bind_C:\Users\RUNNER~1\AppData\Local\Temp\test-mounts-api-13699587998_c:\foo_true__<nil>_<nil>_<nil>_<nil>} (13.08s)
    docker_api_containers_test.go:2157: timeout hit after 10s: container 67863418730b3320bb297b492d79b5d66a3d00109be881811bf3f97dc0fb571d is running, waiting for exit

=== FAIL: github.com/docker/docker/integration-cli TestDockerAPISuite/TestContainersAPICreateMountsCreate (89.19s)

=== FAIL: github.com/docker/docker/integration-cli TestDockerAPISuite (857.05s)

Not sure what's happening with docker-py would have to check;

---> Making bundle: test-docker-py (in bundles/test-docker-py)
---> Making bundle: .integration-daemon-start (in bundles/test-docker-py)
Using test binary /usr/local/cli-integration/docker
# DOCKER_EXPERIMENTAL is set: starting daemon with experimental features enabled! 
Not: starting.
Starting dockerd
INFO: Waiting for daemon to start...
.
---> Making bundle: .build-empty-images (in bundles/test-docker-py)
Loaded image: emptyfs:latest
Loaded image ID: sha256:0df1207206e5288f4a989a2f13d1f5b3c4e70467702c1d5d21dfc9f002b7bd43
INFO: Building docker-sdk-python3:5.0.3...
ERROR: failed to solve: Unavailable: error reading from server: EOF
make: *** [Makefile:198: test-docker-py] Error 1
Error: Process completed with exit code 2.

@thaJeztah
Copy link
Member Author

Some buildkit CI failures;

=== FAIL: frontend TestFrontendIntegration/TestRefEvaluate/worker=dockerd (1.27s)
    frontend_test.go:341: 
        	Error Trace:	/src/frontend/frontend_test.go:341
        	            				/src/util/testutil/integration/run.go:90
        	            				/src/util/testutil/integration/run.go:204
        	Error:      	Received unexpected error:
        	            	lease does not exist: not found

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@neersighted
Copy link
Member

Closing as the relevant changes are in BK/the original PR now.

@thaJeztah thaJeztah deleted the buildkit_0.12_carry branch July 24, 2023 18:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants