diff options
| author | Valentin David <valentin.david@codethink.co.uk> | 2018-12-20 12:57:10 +0100 |
|---|---|---|
| committer | Valentin David <valentin.david@gmail.com> | 2019-01-09 10:45:23 +0000 |
| commit | 17c5ca2d48fff08df711c76954cf3d92a1b10550 (patch) | |
| tree | 6def9714958e6ff8b93d171a2e6845ab657fcea9 | |
| parent | edcc43ed34a81b3a3b4e105f35af03eb25115e1c (diff) | |
| download | buildstream-17c5ca2d48fff08df711c76954cf3d92a1b10550.tar.gz | |
Use relative path to project directory for remote execution certificates/keys
| -rw-r--r-- | buildstream/sandbox/_sandboxremote.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/buildstream/sandbox/_sandboxremote.py b/buildstream/sandbox/_sandboxremote.py index 503cf931a..6fa51e3e6 100644 --- a/buildstream/sandbox/_sandboxremote.py +++ b/buildstream/sandbox/_sandboxremote.py @@ -135,6 +135,16 @@ class SandboxRemote(Sandbox): "remote-execution configuration. Your config is missing '{}'." .format(str(provenance), tls_keys, key)) + def resolve_path(path): + if basedir and path: + return os.path.join(basedir, path) + else: + return path + + for key in tls_keys: + if key in remote_config['execution-service']: + remote_config['execution-service'][key] = resolve_path(remote_config['execution-service'][key]) + spec = RemoteExecutionSpec(remote_config['execution-service'], remote_config['storage-service'], remote_exec_action_config) |