DAOS-16220 test: Include username in default common test directory

src/tests/ftest/launch.py

@@ -280,7 +280,8 @@ def _run(self, args):
             else:
                 set_test_environment(
                     logger, test_env, args.test_servers, args.test_clients, args.provider,
-                    args.insecure_mode, self.details)
+                    args.insecure_mode, self.details, args.agent_user, args.test_log_dir,
+                    args.systemd_path, args.systemd_lib_path)
         except TestEnvironmentException as error:
             message = f"Error setting up test environment: {str(error)}"
             return self.get_exit_status(1, message, "Setup", sys.exc_info())
@@ -318,12 +319,13 @@ def _run(self, args):
             return self.get_exit_status(0, "Listing tests complete")
 
         # Setup the fuse configuration
-        try:
-            setup_fuse_config(logger, args.test_servers | args.test_clients)
-        except LaunchException:
-            # Warn but don't fail
-            message = "Issue detected setting up the fuse configuration"
-            setup_result.warn_test(logger, "Setup", message, sys.exc_info())
+        if args.fuse_setup:
+            try:
+                setup_fuse_config(logger, args.test_servers | args.test_clients)
+            except LaunchException:
+                # Warn but don't fail
+                message = "Issue detected setting up the fuse configuration"
+                setup_result.warn_test(logger, "Setup", message, sys.exc_info())
 
         # Get the core file pattern information
         core_files = {}
@@ -347,8 +349,8 @@ def _run(self, args):
             group.update_test_yaml(
                 logger, args.scm_size, args.scm_mount, args.extra_yaml,
                 args.timeout_multiplier, args.override, args.verbose, args.include_localhost)
-        except (RunException, YamlException) as e:
-            message = "Error modifying the test yaml files: {}".format(e)
+        except (RunException, YamlException) as error:
+            message = f"Error modifying the test yaml files: {error}"
             status |= self.get_exit_status(1, message, "Setup", sys.exc_info())
         except StorageException:
             message = "Error detecting storage information for test yaml files"
@@ -529,6 +531,12 @@ def main():
         "-a", "--archive",
         action="store_true",
         help="archive host log files in the avocado job-results directory")
+    parser.add_argument(
+        "-au", "--agent_user",
+        action="store",
+        default=None,
+        type=str,
+        help="user account to use when running the daos_agent")
     parser.add_argument(
         "-c", "--clear_mounts",
         action="append",
@@ -551,6 +559,10 @@ def main():
         "--failfast",
         action="store_true",
         help="stop the test suite after the first failure")
+    parser.add_argument(
+        "-fs", "--fuse_setup",
+        action="store_true",
+        help="enable setting up fuse configuration files")
     parser.add_argument(
         "-i", "--include_localhost",
         action="store_true",
@@ -573,7 +585,7 @@ def main():
         help="modify the test yaml files but do not run the tests")
     parser.add_argument(
         "-mo", "--mode",
-        choices=['normal', 'manual', 'ci'],
+        choices=['normal', 'manual', 'ci', 'custom_a'],
         default='normal',
         help="provide the mode of test to be run under. Default is normal, "
              "in which the final return code of launch.py is still zero if "
@@ -638,6 +650,18 @@ def main():
         "-si", "--slurm_install",
         action="store_true",
         help="enable installing slurm RPMs if required by the tests")
+    parser.add_argument(
+        "-sl", "--systemd_lib_path",
+        action="store",
+        default=None,
+        type=str,
+        help="the daos_server and daos_agent systemd LD_LIBRARY_PATH to define in the config")
+    parser.add_argument(
+        "-sp", "--systemd_path",
+        action="store",
+        default=None,
+        type=str,
+        help="the daos_server and daos_agent systemd PATH to define in the config")
     parser.add_argument(
         "--scm_mount",
         action="store",
@@ -670,6 +694,12 @@ def main():
         default=NodeSet(),
         help="comma-separated list of hosts to use as replacement values for "
              "client placeholders in each test's yaml file")
+    parser.add_argument(
+        "-tld", "--test_log_dir",
+        action="store",
+        default=None,
+        type=str,
+        help="test log directory base path")
     parser.add_argument(
         "-th", "--logs_threshold",
         action="store",
@@ -733,10 +763,26 @@ def main():
         args.slurm_install = True
         args.slurm_setup = True
         args.user_create = True
+        args.fuse_setup = True
         args.clear_mounts.append("/mnt/daos")
         args.clear_mounts.append("/mnt/daos0")
         args.clear_mounts.append("/mnt/daos1")
 
+    elif args.mode == "custom_a":
+        if args.agent_user is None:
+            # Run the agent with the current user by default
+            args.agent_user = getpass.getuser()
+        if os.environ.get("DAOS_TEST_LOG_DIR", args.test_log_dir) is None:
+            # Use a user-specific test log dir by default
+            args.test_log_dir = os.path.join(
+                os.sep, "var", "tmp", f"daos_testing_{args.agent_user}")
+        args.process_cores = False
+        args.logs_threshold = None
+        args.slurm_install = False
+        args.slurm_setup = False
+        args.user_create = False
+        args.fuse_setup = False
+
     # Setup the Launch object
     launch = Launch(args.name, args.mode, args.slurm_install, args.slurm_setup)
 

src/tests/ftest/util/environment_utils.py

@@ -108,15 +108,16 @@ class TestEnvironment():
         'bullseye_file': 'COVFILE',
         'daos_prefix': 'DAOS_TEST_PREFIX',
         'agent_user': 'DAOS_TEST_AGENT_USER',
-        'systemd_library_path': 'DAOS_TEST_SYSTEMD_LIBRARY_PATH',
+        'systemd_path': 'DAOS_TEST_SYSTEMD_PATH',
+        'systemd_ld_library_path': 'DAOS_TEST_SYSTEMD_LD_LIBRARY_PATH',
     }
 
     def __init__(self):
         """Initialize a TestEnvironment object with existing or default test environment values."""
         self.set_defaults(None)
 
     def set_defaults(self, logger, servers=None, clients=None, provider=None, insecure_mode=None,
-                     agent_user=None, log_dir=None, systemd_lib_path=None):
+                     agent_user=None, log_dir=None, systemd_path=None, systemd_lib_path=None):
         """Set the default test environment variable values with optional inputs.
 
         Args:
@@ -131,7 +132,9 @@ def set_defaults(self, logger, servers=None, clients=None, provider=None, insecu
             agent_user (str, optional): user account to use when running the daos_agent. Defaults
                 to None.
             log_dir (str, optional): test log directory base path. Defaults to None.
-            systemd_lib_path (str, optional): systemd library path. Defaults to None.
+            systemd_path (str, optional): systemd PATH to use in testing. Defaults to None.
+            systemd_lib_path (str, optional): systemd LD_LIBRARY_PATH to use in testing. Defaults
+                to None.
 
         Raises:
             TestEnvironmentException: if there are any issues setting environment variable default
@@ -150,8 +153,10 @@ def set_defaults(self, logger, servers=None, clients=None, provider=None, insecu
             self.insecure_mode = insecure_mode
         if agent_user is not None:
             self.agent_user = agent_user
+        if systemd_path is not None:
+            self.systemd_path = systemd_path
         if systemd_lib_path is not None:
-            self.systemd_library_path = systemd_lib_path
+            self.systemd_ld_library_path = systemd_lib_path
 
         # Set defaults for any unset values
         if self.log_dir is None:
@@ -176,8 +181,10 @@ def set_defaults(self, logger, servers=None, clients=None, provider=None, insecu
             self.daos_prefix = self._default_daos_prefix(logger)
         if self.agent_user is None:
             self.agent_user = self._default_agent_user()
-        if self.systemd_library_path is None:
-            self.systemd_library_path = self._default_systemd_library_path()
+        if self.systemd_path is None:
+            self.systemd_path = self._default_systemd_path()
+        if self.systemd_ld_library_path is None:
+            self.systemd_ld_library_path = self._default_systemd_ld_library_path()
 
     def __set_value(self, key, value):
         """Set the test environment variable.
@@ -582,36 +589,64 @@ def _default_agent_user():
         return 'root'
 
     @property
-    def systemd_library_path(self):
+    def systemd_ld_library_path(self):
         """Get the systemd LD_LIBRARY_PATH.
 
         Returns:
             str: the systemd LD_LIBRARY_PATH
         """
-        return os.environ.get(self.__ENV_VAR_MAP['systemd_library_path'])
+        return os.environ.get(self.__ENV_VAR_MAP['systemd_ld_library_path'])
 
-    @systemd_library_path.setter
-    def systemd_library_path(self, value):
+    @systemd_ld_library_path.setter
+    def systemd_ld_library_path(self, value):
         """Set the systemd LD_LIBRARY_PATH.
 
         Args:
             value (str): the systemd LD_LIBRARY_PATH
         """
-        self.__set_value('systemd_library_path', value)
+        self.__set_value('systemd_ld_library_path', value)
 
     @staticmethod
-    def _default_systemd_library_path():
+    def _default_systemd_ld_library_path():
         """Get the default systemd LD_LIBRARY_PATH.
 
         Returns:
             str: the default systemd LD_LIBRARY_PATH
         """
         return None
 
+    @property
+    def systemd_path(self):
+        """Get the systemd PATH.
+
+        Returns:
+            str: the systemd PATH
+        """
+        return os.environ.get(self.__ENV_VAR_MAP['systemd_path'])
+
+    @systemd_path.setter
+    def systemd_path(self, value):
+        """Set the systemd PATH.
+
+        Args:
+            value (str): the systemd PATH
+        """
+        self.__set_value('systemd_path', value)
+
+    @staticmethod
+    def _default_systemd_path():
+        """Get the default systemd PATH.
+
+        Returns:
+            str: the default systemd PATH
+        """
+        return None
+
 
 def set_test_environment(logger, test_env=None, servers=None, clients=None, provider=None,
                          insecure_mode=False, details=None, agent_user=None, log_dir=None,
-                         systemd_lib_path=None):
+                         systemd_path=None, systemd_lib_path=None):
+    # pylint: disable=too-many-arguments
     """Set up the test environment.
 
     Args:
@@ -629,7 +664,9 @@ def set_test_environment(logger, test_env=None, servers=None, clients=None, prov
         agent_user (str, optional): user account to use when running the daos_agent. Defaults to
             None.
         log_dir (str, optional): test log directory base path. Defaults to None.
-        systemd_lib_path (str, optional): systemd library path. Defaults to None.
+        systemd_path (str, optional): systemd PATH to use w/ tests. Defaults to None.
+        systemd_lib_path (str, optional): systemd LD_LIBRARY_PATH to use in testing. Defaults
+                to None.
 
     Raises:
         TestEnvironmentException: if there is a problem setting up the test environment
@@ -641,7 +678,7 @@ def set_test_environment(logger, test_env=None, servers=None, clients=None, prov
     if test_env:
         # Get the default fabric interface, provider, and daos prefix
         test_env.set_defaults(
-            logger, servers, clients, provider, insecure_mode, agent_user, log_dir,
+            logger, servers, clients, provider, insecure_mode, agent_user, log_dir, systemd_path,
             systemd_lib_path)
         logger.info("Testing with interface:   %s", test_env.interface)
         logger.info("Testing with provider:    %s", test_env.provider)

src/tests/ftest/util/launch_utils.py

@@ -541,7 +541,7 @@ def _setup_test_directory(self, logger, test):
         hosts.add(self.local_host)
         logger.debug("Setting up '%s' on %s:", test_env.log_dir, hosts)
         commands = [
-            f"sudo -n rm -fr {test_env.log_dir}",
+            f"rm -fr {test_env.log_dir}",
             f"mkdir -p {test_env.log_dir}",
             f"chmod a+wrx {test_env.log_dir}",
             f"ls -al {test_env.log_dir}",

src/tests/ftest/util/server_utils_base.py

@@ -34,7 +34,7 @@ class DaosServerCommand(YamlCommand):
 
     DEFAULT_CONFIG_FILE = os.path.join(os.sep, "etc", "daos", "daos_server.yml")
 
-    def __init__(self, path="", yaml_cfg=None, timeout=45):
+    def __init__(self, path="", yaml_cfg=None, timeout=45, run_user=None):
         """Create a daos_server command object.
 
         Args:
@@ -43,9 +43,11 @@ def __init__(self, path="", yaml_cfg=None, timeout=45):
                 Defaults to None.
             timeout (int, optional): number of seconds to wait for patterns to
                 appear in the subprocess output. Defaults to 45 seconds.
+            run_user (str, optional): user to run as. Defaults to None, which will run commands as
+                the current user.
         """
         super().__init__(
-            "/run/daos_server/*", "daos_server", path, yaml_cfg, timeout)
+            "/run/daos_server/*", "daos_server", path, yaml_cfg, timeout, run_user)
         self.pattern = self.NORMAL_PATTERN
 
         # Command line parameters:

src/tests/ftest/util/server_utils_params.py

@@ -501,6 +501,7 @@ def __init__(self, base_namespace, index, provider=None, max_storage_tiers=MAX_S
             if name in self.REQUIRED_ENV_VARS:
                 default_env_vars.extend(self.REQUIRED_ENV_VARS[name])
         self.env_vars = BasicParameter(None, default_env_vars)
+        self.env_pass_through = BasicParameter(None, None)
 
         # the storage configuration for this engine
         self.storage = StorageYamlParameters(self.namespace, max_storage_tiers)