From 5a3f484c07be1b90576ea4a0f999e301f40af209 Mon Sep 17 00:00:00 2001 From: Phil Owen <19691521+PhillipsOwen@users.noreply.github.com> Date: Mon, 1 Apr 2024 16:27:18 -0400 Subject: [PATCH] restoring nfs directory path code. but commenting out the functionality until NFS dir perms are resolved. --- src/staging/staging.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/staging/staging.py b/src/staging/staging.py index f5ae7fd..2e4297b 100644 --- a/src/staging/staging.py +++ b/src/staging/staging.py @@ -212,15 +212,18 @@ def create_test_files(self, run_dir: str, run_data: json, workflow_type: Workflo # this directory may or may not exist fp.write(f'echo "Copying /var/log/irods dir into {data_path}..."; cp -R /var/log/irods {data_path};\n') + ############# + # TODO: this section is commented out until the NFS directory permissions are resolved + ############# # if specified, use the package directory - if run_data['request_data']['package-dir']: - self.default_pkg_dir = run_data['request_data']['package-dir'] + # if run_data['request_data']['package-dir']: + # self.default_pkg_dir = run_data['request_data']['package-dir'] # get the directory path - archive_dir: str = str(os.path.join(self.default_pkg_dir, run_data['request_group'], str(run_data['id']))) + # archive_dir: str = str(os.path.join(self.default_pkg_dir, run_data['request_group'], str(run_data['id']))) # create the command to create the directory - fp.write(f'echo "Creating the archive directory {archive_dir}..."; mkdir -p {archive_dir};\n') + # fp.write(f'echo "Creating the archive directory {archive_dir}..."; mkdir -p {archive_dir};\n') # get the full path to the test results archive file # archive_file: str = str(os.path.join(archive_dir, f'{executor}.tar.gz'))