diff options
| author | Jürg Billeter <j@bitron.ch> | 2018-09-26 10:05:02 +0100 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2018-09-27 10:18:42 +0100 |
| commit | cb6b35dc2f7e4cc9580bdd840c62a2b1c00758b7 (patch) | |
| tree | 023070afd86a3fbcd72932754e03f5ba73814c10 | |
| parent | 52991be17f99641a2ade97104a6dbeac7d7d3654 (diff) | |
| download | buildstream-cb6b35dc2f7e4cc9580bdd840c62a2b1c00758b7.tar.gz | |
sandbox/_sandboxremote.py: Migrate to Context.artifactcache
| -rw-r--r-- | buildstream/sandbox/_sandboxremote.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/buildstream/sandbox/_sandboxremote.py b/buildstream/sandbox/_sandboxremote.py index 6a49ec4bb..d934832bb 100644 --- a/buildstream/sandbox/_sandboxremote.py +++ b/buildstream/sandbox/_sandboxremote.py @@ -28,7 +28,6 @@ from ..storage._filebaseddirectory import FileBasedDirectory from ..storage._casbaseddirectory import CasBasedDirectory from .._protos.build.bazel.remote.execution.v2 import remote_execution_pb2, remote_execution_pb2_grpc from .._protos.google.rpc import code_pb2 -from .._platform import Platform class SandboxError(Exception): @@ -72,8 +71,8 @@ class SandboxRemote(Sandbox): output_files=[], output_directories=[self._output_directory], platform=None) - platform = Platform.get_platform() - cascache = platform.artifactcache + context = self._get_context() + cascache = context.artifactcache # Upload the Command message to the remote CAS server command_digest = cascache.push_message(self._get_project(), remote_command) if not command_digest or not cascache.verify_digest_pushed(self._get_project(), command_digest): @@ -135,8 +134,8 @@ class SandboxRemote(Sandbox): if tree_digest is None or not tree_digest.hash: raise SandboxError("Output directory structure had no digest attached.") - platform = Platform.get_platform() - cascache = platform.artifactcache + context = self._get_context() + cascache = context.artifactcache # Now do a pull to ensure we have the necessary parts. dir_digest = cascache.pull_tree(self._get_project(), tree_digest) if dir_digest is None or not dir_digest.hash or not dir_digest.size_bytes: @@ -171,8 +170,8 @@ class SandboxRemote(Sandbox): upload_vdir.recalculate_hash() - platform = Platform.get_platform() - cascache = platform.artifactcache + context = self._get_context() + cascache = context.artifactcache # Now, push that key (without necessarily needing a ref) to the remote. cascache.push_directory(self._get_project(), upload_vdir) if not cascache.verify_digest_pushed(self._get_project(), upload_vdir.ref): |