[ARVADOS] updated: 1.3.0-2391-gf5b174a16
Git user
git at public.arvados.org
Wed Apr 1 01:04:40 UTC 2020
Summary of changes:
sdk/cwl/tests/federation/README | 2 +-
sdk/cwl/tests/federation/arvbox-make-federation.cwl | 12 ++++++------
.../tests/federation/{arvbox => arvboxcwl}/fed-config.cwl | 6 +++---
sdk/cwl/tests/federation/{arvbox => arvboxcwl}/mkdir.cwl | 6 +++---
.../tests/federation/{arvbox => arvboxcwl}/setup-user.cwl | 8 +++++---
sdk/cwl/tests/federation/{arvbox => arvboxcwl}/setup_user.py | 0
sdk/cwl/tests/federation/{arvbox => arvboxcwl}/start.cwl | 4 ++--
sdk/cwl/tests/federation/{arvbox => arvboxcwl}/stop.cwl | 0
sdk/python/tests/fed-migrate/README | 2 +-
sdk/python/tests/fed-migrate/arvbox-make-federation.cwl | 4 ++--
10 files changed, 23 insertions(+), 21 deletions(-)
rename sdk/cwl/tests/federation/{arvbox => arvboxcwl}/fed-config.cwl (96%)
rename sdk/cwl/tests/federation/{arvbox => arvboxcwl}/mkdir.cwl (91%)
rename sdk/cwl/tests/federation/{arvbox => arvboxcwl}/setup-user.cwl (87%)
rename sdk/cwl/tests/federation/{arvbox => arvboxcwl}/setup_user.py (100%)
rename sdk/cwl/tests/federation/{arvbox => arvboxcwl}/start.cwl (97%)
rename sdk/cwl/tests/federation/{arvbox => arvboxcwl}/stop.cwl (100%)
via f5b174a167150489a42472525edb538773e077e5 (commit)
from 5cffccdf363c48752c33b675130575ccb773d1c9 (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 f5b174a167150489a42472525edb538773e077e5
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Tue Mar 31 21:03:42 2020 -0400
16263: Tweak federation tests, use CWL 1.1
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/sdk/cwl/tests/federation/README b/sdk/cwl/tests/federation/README
index e5eb04c60..f97ca9726 100644
--- a/sdk/cwl/tests/federation/README
+++ b/sdk/cwl/tests/federation/README
@@ -26,7 +26,7 @@ Create main-test.json:
Or create an arvbox test cluster:
-$ cwltool --enable-ext arvbox-make-federation.cwl --arvbox_base ~/.arvbox/ --in_acr /path/to/arvados-cwl-runner > main-test.json
+$ cwltool arvbox-make-federation.cwl --arvbox_base ~/.arvbox/ --in_acr /path/to/arvados-cwl-runner > main-test.json
Run tests:
diff --git a/sdk/cwl/tests/federation/arvbox-make-federation.cwl b/sdk/cwl/tests/federation/arvbox-make-federation.cwl
index 5872dbef5..593f2399f 100644
--- a/sdk/cwl/tests/federation/arvbox-make-federation.cwl
+++ b/sdk/cwl/tests/federation/arvbox-make-federation.cwl
@@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0
-cwlVersion: v1.0
+cwlVersion: v1.1
class: Workflow
$namespaces:
arv: "http://arvados.org/cwl#"
@@ -10,7 +10,7 @@ $namespaces:
requirements:
ScatterFeatureRequirement: {}
StepInputExpressionRequirement: {}
- cwltool:LoadListingRequirement:
+ LoadListingRequirement:
loadListing: no_listing
InlineJavascriptRequirement: {}
inputs:
@@ -64,7 +64,7 @@ steps:
containers: containers
arvbox_base: arvbox_base
out: [arvbox_data]
- run: arvbox/mkdir.cwl
+ run: arvboxcwl/mkdir.cwl
start:
in:
container_name: containers
@@ -74,7 +74,7 @@ steps:
out: [cluster_id, container_host, arvbox_data_out, superuser_token]
scatter: [container_name, arvbox_data]
scatterMethod: dotproduct
- run: arvbox/start.cwl
+ run: arvboxcwl/start.cwl
fed-config:
in:
container_name: containers
@@ -87,10 +87,10 @@ steps:
out: []
scatter: [container_name, this_cluster_id, arvbox_data]
scatterMethod: dotproduct
- run: arvbox/fed-config.cwl
+ run: arvboxcwl/fed-config.cwl
setup-user:
in:
container_host: {source: start/container_host, valueFrom: "$(self[0])"}
superuser_token: {source: start/superuser_token, valueFrom: "$(self[0])"}
out: [test_user_uuid, test_user_token]
- run: arvbox/setup-user.cwl
+ run: arvboxcwl/setup-user.cwl
diff --git a/sdk/cwl/tests/federation/arvbox/fed-config.cwl b/sdk/cwl/tests/federation/arvboxcwl/fed-config.cwl
similarity index 96%
rename from sdk/cwl/tests/federation/arvbox/fed-config.cwl
rename to sdk/cwl/tests/federation/arvboxcwl/fed-config.cwl
index 37936df63..e1cacdcaf 100644
--- a/sdk/cwl/tests/federation/arvbox/fed-config.cwl
+++ b/sdk/cwl/tests/federation/arvboxcwl/fed-config.cwl
@@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0
-cwlVersion: v1.0
+cwlVersion: v1.1
class: CommandLineTool
$namespaces:
arv: "http://arvados.org/cwl#"
@@ -56,11 +56,11 @@ requirements:
}
return JSON.stringify({"development": {"remote_hosts": remoteClusters}});
}
- cwltool:LoadListingRequirement:
+ LoadListingRequirement:
loadListing: no_listing
ShellCommandRequirement: {}
InlineJavascriptRequirement: {}
- cwltool:InplaceUpdateRequirement:
+ InplaceUpdateRequirement:
inplaceUpdate: true
arguments:
- shellQuote: false
diff --git a/sdk/cwl/tests/federation/arvbox/mkdir.cwl b/sdk/cwl/tests/federation/arvboxcwl/mkdir.cwl
similarity index 91%
rename from sdk/cwl/tests/federation/arvbox/mkdir.cwl
rename to sdk/cwl/tests/federation/arvboxcwl/mkdir.cwl
index 727d491a3..854a727c6 100644
--- a/sdk/cwl/tests/federation/arvbox/mkdir.cwl
+++ b/sdk/cwl/tests/federation/arvboxcwl/mkdir.cwl
@@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0
-cwlVersion: v1.0
+cwlVersion: v1.1
class: CommandLineTool
$namespaces:
arv: "http://arvados.org/cwl#"
@@ -37,10 +37,10 @@ requirements:
- entry: $(inputs.arvbox_base)
entryname: base
writable: true
- cwltool:LoadListingRequirement:
+ LoadListingRequirement:
loadListing: no_listing
InlineJavascriptRequirement: {}
- cwltool:InplaceUpdateRequirement:
+ InplaceUpdateRequirement:
inplaceUpdate: true
arguments:
- mkdir
diff --git a/sdk/cwl/tests/federation/arvbox/setup-user.cwl b/sdk/cwl/tests/federation/arvboxcwl/setup-user.cwl
similarity index 87%
rename from sdk/cwl/tests/federation/arvbox/setup-user.cwl
rename to sdk/cwl/tests/federation/arvboxcwl/setup-user.cwl
index a3ad6e575..d8f2d9e12 100644
--- a/sdk/cwl/tests/federation/arvbox/setup-user.cwl
+++ b/sdk/cwl/tests/federation/arvboxcwl/setup-user.cwl
@@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0
-cwlVersion: v1.0
+cwlVersion: v1.1
class: CommandLineTool
$namespaces:
arv: "http://arvados.org/cwl#"
@@ -13,13 +13,15 @@ requirements:
ARVADOS_API_HOST: $(inputs.container_host)
ARVADOS_API_TOKEN: $(inputs.superuser_token)
ARVADOS_API_HOST_INSECURE: "true"
- cwltool:LoadListingRequirement:
+ LoadListingRequirement:
loadListing: no_listing
InlineJavascriptRequirement: {}
- cwltool:InplaceUpdateRequirement:
+ InplaceUpdateRequirement:
inplaceUpdate: true
DockerRequirement:
dockerPull: arvados/jobs
+ NetworkAccess:
+ networkAccess: true
inputs:
container_host: string
superuser_token: string
diff --git a/sdk/cwl/tests/federation/arvbox/setup_user.py b/sdk/cwl/tests/federation/arvboxcwl/setup_user.py
similarity index 100%
rename from sdk/cwl/tests/federation/arvbox/setup_user.py
rename to sdk/cwl/tests/federation/arvboxcwl/setup_user.py
diff --git a/sdk/cwl/tests/federation/arvbox/start.cwl b/sdk/cwl/tests/federation/arvboxcwl/start.cwl
similarity index 97%
rename from sdk/cwl/tests/federation/arvbox/start.cwl
rename to sdk/cwl/tests/federation/arvboxcwl/start.cwl
index 57b348973..5d9aaba2d 100644
--- a/sdk/cwl/tests/federation/arvbox/start.cwl
+++ b/sdk/cwl/tests/federation/arvboxcwl/start.cwl
@@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0
-cwlVersion: v1.0
+cwlVersion: v1.1
class: CommandLineTool
$namespaces:
arv: "http://arvados.org/cwl#"
@@ -64,7 +64,7 @@ requirements:
- entry: $(inputs.arvbox_data)
entryname: $(inputs.container_name)
writable: true
- cwltool:InplaceUpdateRequirement:
+ InplaceUpdateRequirement:
inplaceUpdate: true
InlineJavascriptRequirement: {}
arguments:
diff --git a/sdk/cwl/tests/federation/arvbox/stop.cwl b/sdk/cwl/tests/federation/arvboxcwl/stop.cwl
similarity index 100%
rename from sdk/cwl/tests/federation/arvbox/stop.cwl
rename to sdk/cwl/tests/federation/arvboxcwl/stop.cwl
diff --git a/sdk/python/tests/fed-migrate/README b/sdk/python/tests/fed-migrate/README
index 83d659d4d..1591b7e17 100644
--- a/sdk/python/tests/fed-migrate/README
+++ b/sdk/python/tests/fed-migrate/README
@@ -6,7 +6,7 @@ arv-federation-migrate should be in the path or the full path supplied
in the 'fed_migrate' input parameter.
# Create arvbox containers fedbox(1,2,3) for the federation
-$ cwltool --enable-ext arvbox-make-federation.cwl --arvbox_base ~/.arvbox > fed.json
+$ cwltool arvbox-make-federation.cwl --arvbox_base ~/.arvbox > fed.json
# Configure containers and run tests
$ cwltool fed-migrate.cwl fed.json
diff --git a/sdk/python/tests/fed-migrate/arvbox-make-federation.cwl b/sdk/python/tests/fed-migrate/arvbox-make-federation.cwl
index 0aa6f177a..aa859cba4 100644
--- a/sdk/python/tests/fed-migrate/arvbox-make-federation.cwl
+++ b/sdk/python/tests/fed-migrate/arvbox-make-federation.cwl
@@ -1,4 +1,4 @@
-cwlVersion: v1.0
+cwlVersion: v1.1
class: Workflow
$namespaces:
arv: "http://arvados.org/cwl#"
@@ -32,7 +32,7 @@ requirements:
SubworkflowFeatureRequirement: {}
ScatterFeatureRequirement: {}
StepInputExpressionRequirement: {}
- cwltool:LoadListingRequirement:
+ LoadListingRequirement:
loadListing: no_listing
steps:
start:
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list