[ARVADOS] updated: 1.2.0-327-g457672f26
Git user
git at public.curoverse.com
Thu Nov 8 10:07:43 EST 2018
Summary of changes:
.licenseignore | 1 +
sdk/cwl/tests/federation/README | 4 ++++
sdk/cwl/tests/federation/arvbox-fed-config.cwl | 4 ++++
sdk/cwl/tests/federation/arvbox-fed.cwl | 4 ++++
sdk/cwl/tests/federation/arvbox-mkdir.cwl | 4 ++++
sdk/cwl/tests/federation/arvbox-setup-user.cwl | 4 ++++
sdk/cwl/tests/federation/arvbox-start.cwl | 4 ++++
sdk/cwl/tests/federation/arvbox-stop.cwl | 4 ++++
sdk/cwl/tests/federation/main.cwl | 29 ++++++++++++++++++++++++++
sdk/cwl/tests/federation/md5sum.cwl | 4 ++++
sdk/cwl/tests/federation/prepare.cwl | 4 ++++
sdk/cwl/tests/federation/prepare.py | 4 ++++
sdk/cwl/tests/federation/run-acr.cwl | 6 +++++-
sdk/cwl/tests/federation/setup_user.py | 4 ++++
sdk/cwl/tests/federation/testcase.cwl | 6 ++++++
15 files changed, 85 insertions(+), 1 deletion(-)
via 457672f2662d6c726cd0c66ef5a8d08ebe9791eb (commit)
from a4e764bbe11e6d49ddaa8a52c233b43d162ce00a (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 457672f2662d6c726cd0c66ef5a8d08ebe9791eb
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Wed Nov 7 16:40:27 2018 -0500
14198: Add runner-remote-step-home
Add license headers
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --git a/.licenseignore b/.licenseignore
index 51a1e7cbd..5d3eff344 100644
--- a/.licenseignore
+++ b/.licenseignore
@@ -46,6 +46,7 @@ docker/jobs/apt.arvados.org.list
*/script/rails
sdk/cwl/tests/input/blorp.txt
sdk/cwl/tests/tool/blub.txt
+sdk/cwl/tests/federation/whale.txt
sdk/go/manifest/testdata/*_manifest
sdk/java/.classpath
sdk/java/pom.xml
diff --git a/sdk/cwl/tests/federation/README b/sdk/cwl/tests/federation/README
index 721e6b775..e53793900 100644
--- a/sdk/cwl/tests/federation/README
+++ b/sdk/cwl/tests/federation/README
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
Things to test.
Single step --submit --no-wait workflow, matrix of:
diff --git a/sdk/cwl/tests/federation/arvbox-fed-config.cwl b/sdk/cwl/tests/federation/arvbox-fed-config.cwl
index 173b9df72..77567ee89 100644
--- a/sdk/cwl/tests/federation/arvbox-fed-config.cwl
+++ b/sdk/cwl/tests/federation/arvbox-fed-config.cwl
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
cwlVersion: v1.0
class: CommandLineTool
$namespaces:
diff --git a/sdk/cwl/tests/federation/arvbox-fed.cwl b/sdk/cwl/tests/federation/arvbox-fed.cwl
index 8d7075a1d..91e622022 100644
--- a/sdk/cwl/tests/federation/arvbox-fed.cwl
+++ b/sdk/cwl/tests/federation/arvbox-fed.cwl
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
cwlVersion: v1.0
class: Workflow
$namespaces:
diff --git a/sdk/cwl/tests/federation/arvbox-mkdir.cwl b/sdk/cwl/tests/federation/arvbox-mkdir.cwl
index b047beb9b..727d491a3 100644
--- a/sdk/cwl/tests/federation/arvbox-mkdir.cwl
+++ b/sdk/cwl/tests/federation/arvbox-mkdir.cwl
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
cwlVersion: v1.0
class: CommandLineTool
$namespaces:
diff --git a/sdk/cwl/tests/federation/arvbox-setup-user.cwl b/sdk/cwl/tests/federation/arvbox-setup-user.cwl
index 684bc8c8d..0fddc1b87 100644
--- a/sdk/cwl/tests/federation/arvbox-setup-user.cwl
+++ b/sdk/cwl/tests/federation/arvbox-setup-user.cwl
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
cwlVersion: v1.0
class: CommandLineTool
$namespaces:
diff --git a/sdk/cwl/tests/federation/arvbox-start.cwl b/sdk/cwl/tests/federation/arvbox-start.cwl
index ae591d58f..f69775a53 100644
--- a/sdk/cwl/tests/federation/arvbox-start.cwl
+++ b/sdk/cwl/tests/federation/arvbox-start.cwl
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
cwlVersion: v1.0
class: CommandLineTool
$namespaces:
diff --git a/sdk/cwl/tests/federation/arvbox-stop.cwl b/sdk/cwl/tests/federation/arvbox-stop.cwl
index c4a5412de..2ea4c0f74 100644
--- a/sdk/cwl/tests/federation/arvbox-stop.cwl
+++ b/sdk/cwl/tests/federation/arvbox-stop.cwl
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
cwlVersion: v1.0
class: CommandLineTool
$namespaces:
diff --git a/sdk/cwl/tests/federation/main.cwl b/sdk/cwl/tests/federation/main.cwl
index d481f5c19..4029d53d5 100755
--- a/sdk/cwl/tests/federation/main.cwl
+++ b/sdk/cwl/tests/federation/main.cwl
@@ -1,4 +1,8 @@
#!/usr/bin/env cwl-runner
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
cwlVersion: v1.0
class: Workflow
$namespaces:
@@ -70,6 +74,31 @@ steps:
self["runOnCluster"] = inputs.arvados_cluster_ids[1];
return self;
}
+ runner_cluster: { valueFrom: "$(inputs.arvados_cluster_ids[0])" }
+ scrub_images: {default: ["debian:9"]}
+ scrub_collections: {default: ["cba47aefe5eb3a014a26ec00316b30c1+57", "67beab1cda8fe7d7e623323dc4287b5b+51"]}
+ out: [out]
+ run: testcase.cwl
+
+ runner-remote-step-home:
+ in:
+ arvados_api_token: arvados_api_token
+ arvado_api_host_insecure: arvado_api_host_insecure
+ arvados_api_hosts: arvados_api_hosts
+ arvados_cluster_ids: arvados_cluster_ids
+ acr: acr
+ wf: {default: {class: File, location: md5sum.cwl}}
+ obj:
+ default:
+ inp:
+ class: File
+ location: whale.txt
+ valueFrom: |-
+ ${
+ self["runOnCluster"] = inputs.arvados_cluster_ids[0];
+ return self;
+ }
+ runner_cluster: { valueFrom: "$(inputs.arvados_cluster_ids[1])" }
scrub_images: {default: ["debian:9"]}
scrub_collections: {default: ["cba47aefe5eb3a014a26ec00316b30c1+57", "67beab1cda8fe7d7e623323dc4287b5b+51"]}
out: [out]
diff --git a/sdk/cwl/tests/federation/md5sum.cwl b/sdk/cwl/tests/federation/md5sum.cwl
index 55e1fbf8a..18f3fb0f9 100644
--- a/sdk/cwl/tests/federation/md5sum.cwl
+++ b/sdk/cwl/tests/federation/md5sum.cwl
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
cwlVersion: v1.0
class: CommandLineTool
$namespaces:
diff --git a/sdk/cwl/tests/federation/prepare.cwl b/sdk/cwl/tests/federation/prepare.cwl
index 2463a466e..6c82605bb 100644
--- a/sdk/cwl/tests/federation/prepare.cwl
+++ b/sdk/cwl/tests/federation/prepare.cwl
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
cwlVersion: v1.0
class: CommandLineTool
requirements:
diff --git a/sdk/cwl/tests/federation/prepare.py b/sdk/cwl/tests/federation/prepare.py
index a0ac95588..94a6a75ed 100644
--- a/sdk/cwl/tests/federation/prepare.py
+++ b/sdk/cwl/tests/federation/prepare.py
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
import arvados
import json
diff --git a/sdk/cwl/tests/federation/run-acr.cwl b/sdk/cwl/tests/federation/run-acr.cwl
index 887d113b9..081186506 100644
--- a/sdk/cwl/tests/federation/run-acr.cwl
+++ b/sdk/cwl/tests/federation/run-acr.cwl
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
cwlVersion: v1.0
class: CommandLineTool
inputs:
@@ -11,7 +15,7 @@ inputs:
arvado_api_host_insecure:
type: boolean
default: false
- runner_remote_host:
+ runner_cluster:
type: string?
inputBinding:
prefix: --submit-runner-cluster
diff --git a/sdk/cwl/tests/federation/setup_user.py b/sdk/cwl/tests/federation/setup_user.py
index 2fc621521..a456976be 100644
--- a/sdk/cwl/tests/federation/setup_user.py
+++ b/sdk/cwl/tests/federation/setup_user.py
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
import arvados
import arvados.errors
import time
diff --git a/sdk/cwl/tests/federation/testcase.cwl b/sdk/cwl/tests/federation/testcase.cwl
index 66c510071..b5ef43091 100644
--- a/sdk/cwl/tests/federation/testcase.cwl
+++ b/sdk/cwl/tests/federation/testcase.cwl
@@ -1,4 +1,8 @@
#!/usr/bin/env cwl-runner
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
cwlVersion: v1.0
class: Workflow
$namespaces:
@@ -23,6 +27,7 @@ inputs:
obj: Any
scrub_images: string[]
scrub_collections: string[]
+ runner_cluster: string?
outputs:
out:
type: Any
@@ -46,6 +51,7 @@ steps:
arvados_api_token: arvados_api_token
arvado_api_host_insecure: arvado_api_host_insecure
arvados_api_host: {source: arvados_api_hosts, valueFrom: "$(self[0])"}
+ runner_cluster: runner_cluster
acr: acr
wf: wf
obj: obj
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list