[ARVADOS] updated: 2.1.0-280-g714cc9a88

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/executor.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

       via  714cc9a889786a062641f3627d557667cc71c337 (commit)
      from  bff33bf988ea57ef226d108c574a68053be287ce (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 714cc9a889786a062641f3627d557667cc71c337
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Mon Jan 25 11:25:36 2021 -0500

    17286: Tweak output if neither workbench2 or workbench1 is defined
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py
index 20f4b7309..f60c48087 100644
--- a/sdk/cwl/arvados_cwl/executor.py
+++ b/sdk/cwl/arvados_cwl/executor.py
@@ -526,7 +526,8 @@ The 'jobs' API is no longer supported.
 
         workbench1 = self.api.config()["Services"]["Workbench1"]["ExternalURL"]
         workbench2 = self.api.config()["Services"]["Workbench2"]["ExternalURL"]
-        logger.info("Using cluster %s (%s)", self.api.config()["ClusterID"], workbench2 or workbench1)
+        controller = self.api.config()["Services"]["Controller"]["ExternalURL"]
+        logger.info("Using cluster %s (%s)", self.api.config()["ClusterID"], workbench2 or workbench1 or controller)
 
         updated_tool.visit(self.check_features)
 
@@ -761,7 +762,9 @@ The 'jobs' API is no longer supported.
             raise WorkflowException("Workflow did not return a result.")
 
         if runtimeContext.submit and isinstance(tool, Runner):
-            logger.info("Final output collection %s (%scollections/%s)", tool.final_output, workbench2 or workbench1, tool.final_output)
+            logger.info("Final output collection %s", tool.final_output)
+            if workbench2 or workbench1:
+                logger.info("Output at %scollections/%s", workbench2 or workbench1, tool.final_output)
         else:
             if self.output_name is None:
                 self.output_name = "Output of %s" % (shortname(tool.tool["id"]))

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


hooks/post-receive
--