summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJosh Smith <josh.smith@codethink.co.uk>2020-08-20 16:07:50 +0100
committerQinusty <qinusty@gmail.com>2020-08-26 13:27:44 +0000
commit1325f90174dedef240b7791581e550f62b7d3ccd (patch)
treeec0d94b1676565256368abb41deee71e8d6cde27 /src
parentfaffc7e3cfde8f630a1bd8a865ca0c2ec571a757 (diff)
downloadbuildstream-1325f90174dedef240b7791581e550f62b7d3ccd.tar.gz
runcli.py: Configurable index/storage artifact types
This enables for seperate index/storage artifact servers to be configured by environment variables passed through tox.
Diffstat (limited to 'src')
-rw-r--r--src/buildstream/testing/runcli.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/buildstream/testing/runcli.py b/src/buildstream/testing/runcli.py
index af15b56f1..de4327cd8 100644
--- a/src/buildstream/testing/runcli.py
+++ b/src/buildstream/testing/runcli.py
@@ -775,8 +775,15 @@ def cli_remote_execution(tmpdir, remote_services):
fixture = CliRemote(directory)
+ artifacts = []
if remote_services.artifact_service:
- fixture.configure({"artifacts": [{"url": remote_services.artifact_service, "push": True,}]})
+ artifacts.append({"url": remote_services.artifact_service, "push": True})
+ if remote_services.artifact_index_service:
+ artifacts.append({"url": remote_services.artifact_index_service, "push": True, "type": "index"})
+ if remote_services.artifact_storage_service:
+ artifacts.append({"url": remote_services.artifact_storage_service, "push": True, "type": "storage"})
+ if artifacts:
+ fixture.configure({"artifacts": artifacts})
remote_execution = {}
if remote_services.action_service: