[arvados] updated: 2.7.0-5027-g91ebfb6d38

[git repository hosting]

Summary of changes:
 sdk/cwl/arvados_cwl/arv-cwl-schema-v1.2.yml        | 19 +++++++
 sdk/cwl/arvados_cwl/arvcontainer.py                |  4 +-
 sdk/cwl/arvados_cwl/arvworkflow.py                 | 59 ++++++++++++++++++----
 sdk/cwl/arvados_cwl/context.py                     |  1 +
 sdk/cwl/arvados_cwl/executor.py                    |  5 +-
 sdk/cwl/arvados_cwl/runner.py                      |  4 +-
 sdk/cwl/tests/arvados-tests.yml                    |  6 +++
 .../tests/wf/{runin-wf.cwl => runseparate-wf.cwl}  |  6 ++-
 8 files changed, 88 insertions(+), 16 deletions(-)
 copy sdk/cwl/tests/wf/{runin-wf.cwl => runseparate-wf.cwl} (90%)

       via  91ebfb6d3812313dfa13caa75a6e5fb426c0d519 (commit)
       via  407ea7b545e9529afe12503635e09cad23a96060 (commit)
       via  df566fda61e84d8d99ac133ecc3dbc8726dff40f (commit)
       via  5dc68f920a97034ad92e07caacf92165279c0a63 (commit)
       via  9ff9b33208ebffbb5be7fbe0a684b981f16e0533 (commit)
       via  f9eebd01bb13511dd9644a061a709ac115c47d47 (commit)
       via  86ab45de6b3924d50172411c24242dd265b5e9fc (commit)
       via  b89baf6ccf8ef6de4b3ab139ebf48bc53d4140ed (commit)
       via  927e6781a1bb21e5ef1d887b89916685601b8fd4 (commit)
       via  5e4f9bc4bba1ec5032f853266bd3f747e3d52588 (commit)
       via  950735385f7d8871839e7690e7310218cb6dd9a0 (commit)
      from  5f2c5c47d88f8225c63e3cc060cf6f55faad257c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 91ebfb6d3812313dfa13caa75a6e5fb426c0d519
Merge: 5f2c5c47d8 407ea7b545
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Oct 19 14:44:52 2023 -0400

    Merge branch '20825-cwl-separate-runner' refs #20825
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --cc sdk/cwl/arvados_cwl/arvworkflow.py
index 3ad2c6419a,6b6634bcc9..c592b83dc7
--- a/sdk/cwl/arvados_cwl/arvworkflow.py
+++ b/sdk/cwl/arvados_cwl/arvworkflow.py
@@@ -602,31 -594,12 +603,22 @@@ class ArvadosWorkflow(Workflow)
          self.dynamic_resource_req = []
          self.static_resource_req = []
          self.wf_reffiles = []
 -        self.loadingContext = loadingContext
 -        super(ArvadosWorkflow, self).__init__(toolpath_object, loadingContext)
 +        self.loadingContext = loadingContext.copy()
 +
 +        self.requirements = copy.deepcopy(getdefault(loadingContext.requirements, []))
 +        tool_requirements = toolpath_object.get("requirements", [])
 +        self.hints = copy.deepcopy(getdefault(loadingContext.hints, []))
 +        tool_hints = toolpath_object.get("hints", [])
 +
 +        workflow_runner_req, _ = self.get_requirement("http://arvados.org/cwl#WorkflowRunnerResources")
 +        if workflow_runner_req and workflow_runner_req.get("acrContainerImage"):
 +            self.loadingContext.default_docker_image = workflow_runner_req.get("acrContainerImage")
 +
 +        super(ArvadosWorkflow, self).__init__(toolpath_object, self.loadingContext)
          self.cluster_target_req, _ = self.get_requirement("http://arvados.org/cwl#ClusterTarget")
  
-     def job(self, joborder, output_callback, runtimeContext):
- 
-         builder = make_builder(joborder, self.hints, self.requirements, runtimeContext, self.metadata)
-         runtimeContext = set_cluster_target(self.tool, self.arvrunner, builder, runtimeContext)
- 
-         req, _ = self.get_requirement("http://arvados.org/cwl#RunInSingleContainer")
-         if not req:
-             return super(ArvadosWorkflow, self).job(joborder, output_callback, runtimeContext)
- 
-         # RunInSingleContainer is true
  
+     def runInSingleContainer(self, joborder, output_callback, runtimeContext, builder):
          with SourceLine(self.tool, None, WorkflowException, logger.isEnabledFor(logging.DEBUG)):
              if "id" not in self.tool:
                  raise WorkflowException("%s object must have 'id'" % (self.tool["class"]))
diff --cc sdk/cwl/arvados_cwl/context.py
index dd64879b9f,86812a419a..0439cb5b15
--- a/sdk/cwl/arvados_cwl/context.py
+++ b/sdk/cwl/arvados_cwl/context.py
@@@ -44,7 -43,7 +44,8 @@@ class ArvRuntimeContext(RuntimeContext)
          self.varying_url_params = ""
          self.prefer_cached_downloads = False
          self.cached_docker_lookups = {}
 +        self.print_keep_deps = False
+         self.git_info = {}
  
          super(ArvRuntimeContext, self).__init__(kwargs)
  

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


hooks/post-receive
--