summaryrefslogtreecommitdiff
path: root/tests/conftest.py
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 /tests/conftest.py
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 'tests/conftest.py')
-rwxr-xr-xtests/conftest.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index 476113105..d79ad40b0 100755
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -101,6 +101,8 @@ class RemoteServices:
self.exec_service = kwargs.get("exec_service")
self.source_service = kwargs.get("source_service")
self.storage_service = kwargs.get("storage_service")
+ self.artifact_index_service = kwargs.get("artifact_index_service")
+ self.artifact_storage_service = kwargs.get("artifact_storage_service")
@pytest.fixture(scope="session")
@@ -110,6 +112,12 @@ def remote_services(request):
if "ARTIFACT_CACHE_SERVICE" in os.environ:
kwargs["artifact_service"] = os.environ.get("ARTIFACT_CACHE_SERVICE")
+ if "ARTIFACT_INDEX_SERVICE" in os.environ:
+ kwargs["artifact_index_service"] = os.environ.get("ARTIFACT_INDEX_SERVICE")
+
+ if "ARTIFACT_STORAGE_SERVICE" in os.environ:
+ kwargs["artifact_storage_service"] = os.environ.get("ARTIFACT_STORAGE_SERVICE")
+
if "REMOTE_EXECUTION_SERVICE" in os.environ:
kwargs["action_service"] = os.environ.get("REMOTE_EXECUTION_SERVICE")
kwargs["exec_service"] = os.environ.get("REMOTE_EXECUTION_SERVICE")