Skip to content

Make it possible to pass capture-properties through sandbox config #1953

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Make it possible to pass capture-properties through sandbox config #1953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions src/buildstream/element.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2803,9 +2803,15 @@ def __sandbox(self, stdout=None, stderr=None, config=None, allow_remote=True):
project = self._get_project()
platform = context.platform

config_node_properties = []
if config is not None:
config_node_properties.extend(config.output_node_properties)

if self._get_workspace():
output_node_properties = ["mtime"]
else:
if "mtime" not in output_node_properties:
output_node_properties.append("mtime")

if not output_node_properties:
output_node_properties = None

if allow_remote and context.remote_execution_specs:
Expand Down
21 changes: 18 additions & 3 deletions src/buildstream/sandbox/_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,19 @@
#
class SandboxConfig:
def __init__(
self, *, build_os: str, build_arch: str, build_uid: Optional[int] = None, build_gid: Optional[int] = None
self,
*,
build_os: str,
build_arch: str,
build_uid: Optional[int] = None,
build_gid: Optional[int] = None,
output_node_properties: Union[list, tuple] = tuple(),
):
self.build_os = build_os
self.build_arch = build_arch
self.build_uid = build_uid
self.build_gid = build_gid
self.output_node_properties = output_node_properties

# to_dict():
#
Expand Down Expand Up @@ -108,7 +115,7 @@ def to_dict(self) -> Dict[str, Union[str, int]]:
#
@classmethod
def new_from_node(cls, config: "MappingNode[Node]", *, platform: Optional[Platform] = None) -> "SandboxConfig":
config.validate_keys(["build-uid", "build-gid", "build-os", "build-arch"])
config.validate_keys(["build-uid", "build-gid", "build-os", "build-arch", "fs-capture-properties"])

build_os: str
build_arch: str
Expand All @@ -132,4 +139,12 @@ def new_from_node(cls, config: "MappingNode[Node]", *, platform: Optional[Platfo
build_uid = config.get_int("build-uid", None)
build_gid = config.get_int("build-gid", None)

return cls(build_os=build_os, build_arch=build_arch, build_uid=build_uid, build_gid=build_gid)
output_node_properties = config.get_str_list("fs-capture-properties", [])

return cls(
build_os=build_os,
build_arch=build_arch,
build_uid=build_uid,
build_gid=build_gid,
output_node_properties=output_node_properties,
)