[ARVADOS] updated: 1.2.0-426-gb3f5f8c12

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/arvtool.py                 | 6 ++++--
 sdk/cwl/tests/federation/framework/run-acr.cwl | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

       via  b3f5f8c124348be3208da49dc1287bf01a9f546c (commit)
      from  1a8a01c5175a2ab62c6bbfa13c34a74824e064c9 (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 b3f5f8c124348be3208da49dc1287bf01a9f546c
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Tue Nov 20 17:26:17 2018 -0500

    14198: Add check for uuidPrefix if local cluster isn't in the remoteHosts.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/arvtool.py b/sdk/cwl/arvados_cwl/arvtool.py
index 8167edc57..014cedb75 100644
--- a/sdk/cwl/arvados_cwl/arvtool.py
+++ b/sdk/cwl/arvados_cwl/arvtool.py
@@ -26,8 +26,10 @@ def set_cluster_target(tool, arvrunner, builder, runtimeContext):
         runtimeContext = runtimeContext.copy()
         runtimeContext.submit_runner_cluster = builder.do_eval(cluster_target_req.get("cluster_id")) or runtimeContext.submit_runner_cluster
         runtimeContext.project_uuid = builder.do_eval(cluster_target_req.get("project_uuid")) or runtimeContext.project_uuid
-        if runtimeContext.submit_runner_cluster and runtimeContext.submit_runner_cluster not in arvrunner.api._rootDesc["remoteHosts"]:
-            raise WorkflowException("Unknown or invalid cluster id '%s' known clusters are %s" % (runtimeContext.submit_runner_cluster,
+        if (runtimeContext.submit_runner_cluster and
+            runtimeContext.submit_runner_cluster not in arvrunner.api._rootDesc["remoteHosts"] and
+            runtimeContext.submit_runner_cluster != arvrunner.api._rootDesc["uuidPrefix"]):
+            raise WorkflowException("Unknown or invalid cluster id '%s' known remote clusters are %s" % (runtimeContext.submit_runner_cluster,
                                                                                                       ", ".join(arvrunner.api._rootDesc["remoteHosts"].keys())))
     return runtimeContext
 
diff --git a/sdk/cwl/tests/federation/framework/run-acr.cwl b/sdk/cwl/tests/federation/framework/run-acr.cwl
index b720eaa12..5c8971ba0 100644
--- a/sdk/cwl/tests/federation/framework/run-acr.cwl
+++ b/sdk/cwl/tests/federation/framework/run-acr.cwl
@@ -50,5 +50,7 @@ arguments:
     position: 2
   - valueFrom: --always-submit-runner
     position: 2
+  - valueFrom: --api=containers
+    position: 2
   - valueFrom: input.json
     position: 4
\ No newline at end of file

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


hooks/post-receive
--