integration: fix rootless tests#4101
Merged
tonistiigi merged 2 commits intomoby:masterfrom Aug 7, 2023
Merged
Conversation
8c35ddd to
59d3f21
Compare
AkihiroSuda
reviewed
Aug 3, 2023
59d3f21 to
7a74327
Compare
Member
Author
|
https://github.com/moby/buildkit/actions/runs/5751007434/job/15588925815?pr=4101#step:7:365 First time I see this one. Looks like an issue in GitHub infra. |
AkihiroSuda
approved these changes
Aug 4, 2023
jedevc
approved these changes
Aug 4, 2023
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
7a74327 to
56c89ea
Compare
tonistiigi
approved these changes
Aug 7, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fixes #4100
Using an env var to set the otel socket path for the integration tests in #4078 requires to preserve the environment variables when using sudo for rootless mode but we can't use
-Ewhen we run a login shell (-i).Specifying
BUILDKIT_TRACE_SOCKETin buildkitArgs for oci and containerd workers in integration tests is tedious as tmpdir is not yet defined so I switched from an env var to a newotel-socket-pathflag for the buildkitd command. I took the opportunity to also set a new section in the TOML config if that makes sense. Let me know if you prefer a new PR for this or if the flag is enough.