[ignite] branch ignite-ducktape updated: IGNITE-14727 SSL test should work with custom persistance root (#9099)

[nizhikov]

This is an automated email from the ASF dual-hosted git repository.

nizhikov pushed a commit to branch ignite-ducktape
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/ignite-ducktape by this push:
     new c977265  IGNITE-14727  SSL test should work with custom persistance 
root (#9099)
c977265 is described below

commit c977265a044b189a01794c382ccae423af70e044
Author: Mikhail Filatov <mi...@mfilatov.ru>
AuthorDate: Tue May 18 09:40:38 2021 +0300

    IGNITE-14727  SSL test should work with custom persistance root (#9099)
---
 modules/ducktests/tests/ignitetest/services/utils/path.py | 9 ++++++++-
 modules/ducktests/tests/ignitetest/tests/ssl_test.py      | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/ducktests/tests/ignitetest/services/utils/path.py 
b/modules/ducktests/tests/ignitetest/services/utils/path.py
index 71bf0a5..06b2398 100644
--- a/modules/ducktests/tests/ignitetest/services/utils/path.py
+++ b/modules/ducktests/tests/ignitetest/services/utils/path.py
@@ -42,6 +42,13 @@ def get_module_path(project_dir, module_name, is_dev):
     return os.path.join(project_dir, module_path)
 
 
+def get_shared_root_path(test_globals):
+    """
+    Get path to shared root directory.
+    """
+    return os.path.join(test_globals.get("persistent_root", "/mnt/service"), 
"shared")
+
+
 class PathAware:
     """
     Basic class for path configs.
@@ -125,7 +132,7 @@ class PathAware:
         """
         :return: path to directory with shared files - same files on all nodes
         """
-        return os.path.join(self.persistent_root, "shared")
+        return get_shared_root_path(self.globals)
 
     @property
     @abstractmethod
diff --git a/modules/ducktests/tests/ignitetest/tests/ssl_test.py 
b/modules/ducktests/tests/ignitetest/tests/ssl_test.py
index bcdc21e..975d65a 100644
--- a/modules/ducktests/tests/ignitetest/tests/ssl_test.py
+++ b/modules/ducktests/tests/ignitetest/tests/ssl_test.py
@@ -20,6 +20,7 @@ from ignitetest.services.ignite import IgniteService
 from ignitetest.services.ignite_app import IgniteApplicationService
 from ignitetest.services.utils.control_utility import ControlUtility
 from ignitetest.services.utils.ignite_configuration import IgniteConfiguration
+from ignitetest.services.utils.path import get_shared_root_path
 from ignitetest.services.utils.ssl.connector_configuration import 
ConnectorConfiguration
 from ignitetest.services.utils.ssl.ssl_params import SslParams, 
DEFAULT_SERVER_KEYSTORE, DEFAULT_CLIENT_KEYSTORE, \
     DEFAULT_ADMIN_KEYSTORE
@@ -41,7 +42,7 @@ class SslTest(IgniteTest):
         Test that IgniteService, IgniteApplicationService correctly start and 
stop with ssl configurations.
         And check ControlUtility with ssl arguments.
         """
-        shared_root = "/mnt/service/shared"
+        shared_root = get_shared_root_path(self.test_context.globals)
 
         server_ssl = SslParams(shared_root, 
key_store_jks=DEFAULT_SERVER_KEYSTORE)