From: Peter Amstutz Date: Tue, 8 Nov 2016 22:15:19 +0000 (-0500) Subject: 10460: Add check for 'dockerOutputDirectory' and raise UnsupportedError for now. X-Git-Tag: 1.1.0~609^2 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/0c54a5c8b5d934cb3015234a41c3937b3d0fc3b9 10460: Add check for 'dockerOutputDirectory' and raise UnsupportedError for now. --- diff --git a/sdk/cwl/arvados_cwl/arvjob.py b/sdk/cwl/arvados_cwl/arvjob.py index 4336c0fb10..8a62204f8f 100644 --- a/sdk/cwl/arvados_cwl/arvjob.py +++ b/sdk/cwl/arvados_cwl/arvjob.py @@ -85,6 +85,8 @@ class ArvadosJob(object): with Perf(metrics, "arv_docker_get_image %s" % self.name): (docker_req, docker_is_req) = get_feature(self, "DockerRequirement") if docker_req and kwargs.get("use_container") is not False: + if docker_req.get("dockerOutputDirectory"): + raise UnsupportedRequirement("Option 'dockerOutputDirectory' of DockerRequirement not supported.") runtime_constraints["docker_image"] = arv_docker_get_image(self.arvrunner.api, docker_req, pull_image, self.arvrunner.project_uuid) else: runtime_constraints["docker_image"] = arvados_jobs_image(self.arvrunner) diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py index ba41d7d97e..a1142544f5 100644 --- a/sdk/cwl/arvados_cwl/runner.py +++ b/sdk/cwl/arvados_cwl/runner.py @@ -110,6 +110,9 @@ def upload_docker(arvrunner, tool): if isinstance(tool, CommandLineTool): (docker_req, docker_is_req) = get_feature(tool, "DockerRequirement") if docker_req: + if docker_req.get("dockerOutputDirectory"): + # TODO: can be supported by containers API, but not jobs API. + raise UnsupportedRequirement("Option 'dockerOutputDirectory' of DockerRequirement not supported.") arv_docker_get_image(arvrunner.api, docker_req, True, arvrunner.project_uuid) elif isinstance(tool, cwltool.workflow.Workflow): for s in tool.steps: