X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/43ad590772de48fbc3a6a45654445bab79a0bdc1..83f05664d99a7d80b2d2ae9c0517004cbfb5d00d:/sdk/cwl/arvados_cwl/util.py diff --git a/sdk/cwl/arvados_cwl/util.py b/sdk/cwl/arvados_cwl/util.py index 776fc6bc25..a0dfb290c1 100644 --- a/sdk/cwl/arvados_cwl/util.py +++ b/sdk/cwl/arvados_cwl/util.py @@ -5,6 +5,8 @@ import datetime from arvados.errors import ApiError +collectionUUID = "http://arvados.org/cwl#collectionUUID" + def get_intermediate_collection_info(workflow_step_name, current_container, intermediate_output_ttl): if workflow_step_name: name = "Intermediate collection for step %s" % (workflow_step_name) @@ -14,9 +16,9 @@ def get_intermediate_collection_info(workflow_step_name, current_container, inte if intermediate_output_ttl > 0: trash_time = datetime.datetime.utcnow() + datetime.timedelta(seconds=intermediate_output_ttl) container_uuid = None + props = {"type": "intermediate"} if current_container: - container_uuid = current_container['uuid'] - props = {"type": "intermediate", "container": container_uuid} + props["container"] = current_container['uuid'] return {"name" : name, "trash_at" : trash_time, "properties" : props} @@ -30,5 +32,5 @@ def get_current_container(api, num_retries=0, logger=None): if logger: logger.info("Getting current container: %s", e) raise e - + return current_container