update tapis system file ref ext. Update TapisJob task executor to al…

…low null execSystemInputDir
tapis-project · Nov 3, 2023 · b1ca242 · b1ca242
1 parent e96ca93
commit b1ca242
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/engine/src/contrib/tapis/constants.py b/src/engine/src/contrib/tapis/constants.py
@@ -14,7 +14,7 @@
 TASK_TYPE_TAPIS_ACTOR = "tapis_actor"
 TASK_TYPE_TAPIS_JOB = "tapis_job"
 
-TAPIS_SYSTEM_FILE_REF_EXTENSION = "TapisSystemFile"
+TAPIS_SYSTEM_FILE_REF_EXTENSION = "TapisSystemFile.json"
 
 ARCHIVER_TYPE_TAPIS_SYSTEM = "system"
 

diff --git a/src/engine/src/contrib/tapis/executors/TapisJob.py b/src/engine/src/contrib/tapis/executors/TapisJob.py
@@ -29,7 +29,8 @@ def execute(self):
                 exec_system_input_dir = app.jobAttributes.execSystemInputDir
 
             if exec_system_input_dir == None:
-                raise Exception("Exec system input dir must be specified in either the App or the Job definition")
+                exec_system_input_dir = "*"
+                # raise Exception("Exec system input dir must be specified in either the App or the Job definition")
 
             # Add TapisSystemFiles from previous task output as fileInput/Arrays to the job definition
             file_input_arrays = []
@@ -102,7 +103,7 @@ def execute(self):
 
                 return self._task_result(0)
 
-            return self._task_result(1)
+            return self._task_result(1, errors=[f"Job '{job.name}' ended with status {job.status}. Last Message: {job.lastMessage}"])
 
         except Exception as e:
             return self._task_result(1, errors=[str(e)])