@@ -102,8 +102,8 @@ def run_build_test(self, cache_mode, il_lib=None, run_on_vms=False):
102102 mount_dir = dfuse .mount_dir .value
103103 build_dir = os .path .join (mount_dir , 'daos' )
104104
105- remote_env ['PATH' ] = f"{ os .path .join (mount_dir , 'venv' , 'bin' )} :$PATH"
106- remote_env ['VIRTUAL_ENV' ] = os .path .join (mount_dir , 'venv' )
105+ # remote_env['PATH'] = f"{os.path.join(mount_dir, 'venv', 'bin')}:$PATH"
106+ # remote_env['VIRTUAL_ENV'] = os.path.join(mount_dir, 'venv')
107107 remote_env ['COVFILE' ] = os .environ ['COVFILE' ]
108108 remote_env ['HTTPS_PROXY' ] = os .environ .get ('HTTPS_PROXY' , '' )
109109 remote_env ['NO_PROXY' ] = os .environ .get ('NO_PROXY' , '' )
@@ -129,6 +129,7 @@ def run_build_test(self, cache_mode, il_lib=None, run_on_vms=False):
129129 elif "ubuntu" in distro_info .name .lower ():
130130 distro = "ubuntu"
131131
132+ venv_activate = os .path .join (mount_dir , 'venv' , 'bin' , 'activate' )
132133 cmds = [f'{ sys .executable } -m venv { mount_dir } /venv' ,
133134 f'git clone https://github.com/daos-stack/daos.git { build_dir } ' ,
134135 f'git -C { build_dir } checkout { __get_daos_build_checkout (self )} ' ,
@@ -146,6 +147,8 @@ def run_build_test(self, cache_mode, il_lib=None, run_on_vms=False):
146147 f'daos filesystem query { mount_dir } ' ]
147148 for cmd in cmds :
148149 command = '{} {}' .format (preload_cmd , cmd )
150+ if '-m venv' not in command :
151+ command = f'source { venv_activate } && { command } '
149152 # Use a short timeout for most commands, but vary the build timeout based on dfuse mode.
150153 timeout = 10 * 60
151154 if cmd .startswith ('scons' ):
0 commit comments