X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f9e94997cb5c2166d8b71874f263544cfc2fe5ba..1010c9e519409f0eb36971df6c382fc7cc0e2732:/sdk/cwl/arvados_cwl/arvworkflow.py diff --git a/sdk/cwl/arvados_cwl/arvworkflow.py b/sdk/cwl/arvados_cwl/arvworkflow.py index b802e9e165..ae90625102 100644 --- a/sdk/cwl/arvados_cwl/arvworkflow.py +++ b/sdk/cwl/arvados_cwl/arvworkflow.py @@ -52,13 +52,24 @@ def upload_workflow(arvRunner, tool, job_order, project_uuid, uuid=None, upload_dependencies(arvRunner, name, tool.doc_loader, packed, tool.tool["id"], False) - # TODO nowhere for submit_runner_ram to go. + if submit_runner_ram: + hints = main.get("hints", []) + found = False + for h in hints: + if h["class"] == "http://arvados.org/cwl#WorkflowRunnerResources": + h["ramMin"] = submit_runner_ram + found = True + break + if not found: + hints.append({"class": "http://arvados.org/cwl#WorkflowRunnerResources", + "ramMin": submit_runner_ram}) + main["hints"] = hints body = { "workflow": { "name": name, "description": tool.tool.get("doc", ""), - "definition":yaml.round_trip_dump(packed) + "definition":json.dumps(packed, sort_keys=True, indent=4, separators=(',',': ')) }} if project_uuid: body["workflow"]["owner_uuid"] = project_uuid