Remove 'default-platform-properties' and reduce scopetpollard/custom-platform-properties

1 files changed, 3 insertions, 7 deletions

diff --git a/tests/conftest.py b/tests/conftest.py
index a0fc1121d..759a06005 100755
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -103,8 +103,7 @@ class RemoteServices:
         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")
-        self.use_defaults = kwargs.get("default_properties")
-        self.custom_properties = kwargs.get("custom_properties")
+        self.platform_properties = kwargs.get("platform_properties")
 
 
 @pytest.fixture(scope="session")
@@ -128,11 +127,8 @@ def remote_services(request):
     if "SOURCE_CACHE_SERVICE" in os.environ:
         kwargs["source_service"] = os.environ.get("SOURCE_CACHE_SERVICE")
 
-    if "DEFAULT_PROPERTIES" in os.environ:
-        kwargs["default_properties"] = os.environ.get("DEFAULT_PROPERTIES")
-
-    if "CUSTOM_PROPERTIES" in os.environ:
-        kwargs["custom_properties"] = os.environ.get("CUSTOM_PROPERTIES")
+    if "PLATFORM_PROPERTIES" in os.environ:
+        kwargs["platform_properties"] = os.environ.get("PLATFORM_PROPERTIES")
 
     return RemoteServices(**kwargs)