... |
... |
@@ -139,8 +139,7 @@ class SandboxRemote(Sandbox): |
139
|
139
|
|
140
|
140
|
# Upload the Command message to the remote CAS server
|
141
|
141
|
command_digest = cascache.push_message(casremote, remote_command)
|
142
|
|
- if not command_digest or not cascache.verify_digest_on_remote(casremote, command_digest):
|
143
|
|
- raise SandboxError("Failed pushing build command to remote CAS.")
|
|
142
|
+
|
144
|
143
|
# Create and send the action.
|
145
|
144
|
action = remote_execution_pb2.Action(command_digest=command_digest,
|
146
|
145
|
input_root_digest=input_root_digest,
|
... |
... |
@@ -149,8 +148,6 @@ class SandboxRemote(Sandbox): |
149
|
148
|
|
150
|
149
|
# Upload the Action message to the remote CAS server
|
151
|
150
|
action_digest = cascache.push_message(casremote, action)
|
152
|
|
- if not action_digest or not cascache.verify_digest_on_remote(casremote, action_digest):
|
153
|
|
- raise SandboxError("Failed pushing build action to remote CAS.")
|
154
|
151
|
|
155
|
152
|
# Next, try to create a communication channel to the BuildGrid server.
|
156
|
153
|
url = urlparse(self.exec_url)
|
... |
... |
@@ -299,15 +296,11 @@ class SandboxRemote(Sandbox): |
299
|
296
|
|
300
|
297
|
casremote = CASRemote(self.storage_remote_spec)
|
301
|
298
|
# Now, push that key (without necessarily needing a ref) to the remote.
|
302
|
|
-
|
303
|
299
|
try:
|
304
|
300
|
cascache.push_directory(casremote, upload_vdir)
|
305
|
301
|
except grpc.RpcError as e:
|
306
|
302
|
raise SandboxError("Failed to push source directory to remote: {}".format(e)) from e
|
307
|
303
|
|
308
|
|
- if not cascache.verify_digest_on_remote(casremote, upload_vdir.ref):
|
309
|
|
- raise SandboxError("Failed to verify that source has been pushed to the remote artifact cache.")
|
310
|
|
-
|
311
|
304
|
# Now transmit the command to execute
|
312
|
305
|
operation = self.run_remote_command(command, upload_vdir.ref, cwd, env)
|
313
|
306
|
|