From 1325f90174dedef240b7791581e550f62b7d3ccd Mon Sep 17 00:00:00 2001 From: Josh Smith Date: Thu, 20 Aug 2020 16:07:50 +0100 Subject: runcli.py: Configurable index/storage artifact types This enables for seperate index/storage artifact servers to be configured by environment variables passed through tox. --- tests/conftest.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tests') 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") -- cgit v1.2.1