projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '10583-cwl-salad-ver' refs #10583
[arvados.git]
/
sdk
/
cwl
/
arvados_cwl
/
runner.py
diff --git
a/sdk/cwl/arvados_cwl/runner.py
b/sdk/cwl/arvados_cwl/runner.py
index a1142544f5bf2e16150d56dd4d0b707cfd4db984..3bbcb8b091763cd565051c23a65ce13d1069f08f 100644
(file)
--- a/
sdk/cwl/arvados_cwl/runner.py
+++ b/
sdk/cwl/arvados_cwl/runner.py
@@
-161,7
+161,7
@@
def arvados_jobs_image(arvrunner):
return img
class Runner(object):
return img
class Runner(object):
- def __init__(self, runner, tool, job_order, enable_reuse, output_name):
+ def __init__(self, runner, tool, job_order, enable_reuse, output_name
, output_tags
):
self.arvrunner = runner
self.tool = tool
self.job_order = job_order
self.arvrunner = runner
self.tool = tool
self.job_order = job_order
@@
-170,6
+170,7
@@
class Runner(object):
self.uuid = None
self.final_output = None
self.output_name = output_name
self.uuid = None
self.final_output = None
self.output_name = output_name
+ self.output_tags = output_tags
def update_pipeline_component(self, record):
pass
def update_pipeline_component(self, record):
pass
@@
-194,7
+195,7
@@
class Runner(object):
else:
processStatus = "permanentFail"
else:
processStatus = "permanentFail"
- outputs =
None
+ outputs =
{}
try:
try:
self.final_output = record["output"]
try:
try:
self.final_output = record["output"]
@@
-211,7
+212,7
@@
class Runner(object):
adjustFileObjs(outputs, keepify)
adjustDirObjs(outputs, keepify)
except Exception as e:
adjustFileObjs(outputs, keepify)
adjustDirObjs(outputs, keepify)
except Exception as e:
- logger.e
rror
("While getting final output object: %s", e)
+ logger.e
xception
("While getting final output object: %s", e)
self.arvrunner.output_callback(outputs, processStatus)
finally:
del self.arvrunner.processes[record["uuid"]]
self.arvrunner.output_callback(outputs, processStatus)
finally:
del self.arvrunner.processes[record["uuid"]]