projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
21316: Merge commit '1416f698b72de4b09350d9c2fb25c1405c3247bc' into 21316-left-panel...
[arvados.git]
/
sdk
/
cwl
/
arvados_cwl
/
arvcontainer.py
diff --git
a/sdk/cwl/arvados_cwl/arvcontainer.py
b/sdk/cwl/arvados_cwl/arvcontainer.py
index ea7c9f7a33eee04849ae338388e1f998f5a1918b..84b98378f4196a19714657e66629475c86bdf2bb 100644
(file)
--- a/
sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/
sdk/cwl/arvados_cwl/arvcontainer.py
@@
-593,7
+593,7
@@
class RunnerContainer(Runner):
"ram": 1024*1024 * (math.ceil(self.submit_runner_ram) + math.ceil(self.collection_cache_size)),
"API": True
},
"ram": 1024*1024 * (math.ceil(self.submit_runner_ram) + math.ceil(self.collection_cache_size)),
"API": True
},
- "use_existing":
False, # Never reuse the runner container - see #15497.
+ "use_existing":
self.reuse_runner,
"properties": {}
}
"properties": {}
}
@@
-617,6
+617,8
@@
class RunnerContainer(Runner):
"content": packed
}
container_req["properties"]["template_uuid"] = self.embedded_tool.tool["id"][6:33]
"content": packed
}
container_req["properties"]["template_uuid"] = self.embedded_tool.tool["id"][6:33]
+ elif self.embedded_tool.tool.get("id", "").startswith("file:"):
+ raise WorkflowException("Tool id '%s' is a local file but expected keep: or arvwf:" % self.embedded_tool.tool.get("id"))
else:
main = self.loadingContext.loader.idx["_:main"]
if main.get("id") == "_:main":
else:
main = self.loadingContext.loader.idx["_:main"]
if main.get("id") == "_:main":
@@
-737,14
+739,9
@@
class RunnerContainer(Runner):
logger.info("%s submitted container_request %s", self.arvrunner.label(self), response["uuid"])
logger.info("%s submitted container_request %s", self.arvrunner.label(self), response["uuid"])
- workbench1 = self.arvrunner.api.config()["Services"]["Workbench1"]["ExternalURL"]
workbench2 = self.arvrunner.api.config()["Services"]["Workbench2"]["ExternalURL"]
workbench2 = self.arvrunner.api.config()["Services"]["Workbench2"]["ExternalURL"]
- url = ""
if workbench2:
url = "{}processes/{}".format(workbench2, response["uuid"])
if workbench2:
url = "{}processes/{}".format(workbench2, response["uuid"])
- elif workbench1:
- url = "{}container_requests/{}".format(workbench1, response["uuid"])
- if url:
logger.info("Monitor workflow progress at %s", url)
logger.info("Monitor workflow progress at %s", url)