[ARVADOS] created: 1.1.4-493-g731ff645f

[Git user]

        at  731ff645f6de779a324999f3b78bf90469dbb4fb (commit)


commit 731ff645f6de779a324999f3b78bf90469dbb4fb
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Wed Jun 20 13:19:47 2018 -0400

    13627: Make sure work_api is set on runtimeContext.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index a7e698b6d..bf419dd9b 100644
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -463,6 +463,7 @@ class ArvCwlRunner(object):
         runtimeContext = runtimeContext.copy()
         runtimeContext.use_container = True
         runtimeContext.tmpdir_prefix = "tmp"
+        runtimeContext.work_api = self.work_api
 
         if self.work_api == "containers":
             if self.ignore_docker_for_reuse:
diff --git a/sdk/cwl/arvados_cwl/arvtool.py b/sdk/cwl/arvados_cwl/arvtool.py
index 5b1806b35..119acc303 100644
--- a/sdk/cwl/arvados_cwl/arvtool.py
+++ b/sdk/cwl/arvados_cwl/arvtool.py
@@ -20,6 +20,8 @@ class ArvadosCommandTool(CommandLineTool):
             return partial(ArvadosContainer, self.arvrunner)
         elif runtimeContext.work_api == "jobs":
             return partial(ArvadosJob, self.arvrunner)
+        else:
+            raise Exception("Unsupported work_api %s", runtimeContext.work_api)
 
     def make_path_mapper(self, reffiles, stagedir, runtimeContext, separateDirs):
         if runtimeContext.work_api == "containers":

-----------------------------------------------------------------------


hooks/post-receive
--