try using the same ftest venv

Test-tag: test_dfuse_daos_build_wt_pil4dfs

Signed-off-by: Dalton Bohning <dalton.bohning@hpe.com>

Author: daltonbohning

src/tests/ftest/dfuse/daos_build.py

@@ -102,8 +102,10 @@ def run_build_test(self, cache_mode, il_lib=None, run_on_vms=False):
     mount_dir = dfuse.mount_dir.value
     build_dir = os.path.join(mount_dir, 'daos')
 
-    # remote_env['PATH'] = f"{os.path.join(mount_dir, 'venv', 'bin')}:$PATH"
-    # remote_env['VIRTUAL_ENV'] = os.path.join(mount_dir, 'venv')
+    venv_bin = os.path.dirname(sys.executable)
+    venv = os.path.dirname(venv_bin)
+    remote_env['PATH'] = f"{venv_bin}:$PATH"
+    remote_env['VIRTUAL_ENV'] = venv
     remote_env['COVFILE'] = os.environ['COVFILE']
     remote_env['HTTPS_PROXY'] = os.environ.get('HTTPS_PROXY', '')
     remote_env['NO_PROXY'] = os.environ.get('NO_PROXY', '')
@@ -129,15 +131,16 @@ def run_build_test(self, cache_mode, il_lib=None, run_on_vms=False):
     elif "ubuntu" in distro_info.name.lower():
         distro = "ubuntu"
 
-    venv_activate = os.path.join(mount_dir, 'venv', 'bin', 'activate')
-    cmds = [f'{sys.executable} -m venv {mount_dir}/venv',
-            f'git clone https://github.com/daos-stack/daos.git {build_dir}',
+    # venv_activate = os.path.join(mount_dir, 'venv', 'bin', 'activate')
+    # f'{sys.executable} -m venv {mount_dir}/venv',
+    cmds = [f'git clone https://github.com/daos-stack/daos.git {build_dir}',
             f'git -C {build_dir} checkout {__get_daos_build_checkout(self)}',
             f'git -C {build_dir} submodule update --init --recursive',
             f'cp {build_dir}/utils/scripts/install-{distro}.sh /tmp/install.sh',
             'sudo -E NO_OPENMPI_DEVEL=1 /tmp/install.sh -y',
-            'python3 -m pip install pip --upgrade',
-            f'python3 -m pip install -r {build_dir}/requirements-build.txt',
+            f'{sys.executable} -m pip install pip --upgrade',
+            f'{sys.executable} -m pip install -r {build_dir}/requirements-build.txt',
+            'which scons',
             f'scons -C {build_dir} --jobs {build_jobs} --build-deps=only',
             f'daos filesystem query {mount_dir}',
             f'daos filesystem evict {build_dir}',
@@ -147,8 +150,8 @@ def run_build_test(self, cache_mode, il_lib=None, run_on_vms=False):
             f'daos filesystem query {mount_dir}']
     for cmd in cmds:
         command = '{} {}'.format(preload_cmd, cmd)
-        if '-m venv' not in command:
-            command = f'source {venv_activate} && {command}'
+        # if '-m venv' not in command:
+        #     command = f'source {venv_activate} && {command}'
         # Use a short timeout for most commands, but vary the build timeout based on dfuse mode.
         timeout = 10 * 60
         if cmd.startswith('scons'):