16263: Tweak federation tests, use CWL 1.1

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/sdk/cwl/tests/federation/README b/sdk/cwl/tests/federation/README
index e5eb04c6006ed315b1152cd8ff004172f42f84ee..f97ca972687c6ba25391a7c9e0906ad518888f67 100644 (file)
--- 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 5872dbef5a8ef429f44da0696881bb8272e74e3f..593f2399f5ef3b734fa4f67f3466cc6a4bf98656 100644 (file)
--- 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 37936df6351b6d86e1dfe6619ab19ddc395b3a73..e1cacdcaf70327095f8e2db241824a5427d0fadf 100644 (file)
--- 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 727d491a387a02c580749395690e6ba4dea5082f..854a727c688881960b682867137b5ceb7faed755 100644 (file)
--- 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 a3ad6e575e6ecb2d8526855536c45c2334d5c26f..d8f2d9e12d6c5d8cf31b00a3d947b301237c1b02 100644 (file)
--- 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 57b348973d2ef7a8e7856f1bfbc69744f9485b92..5d9aaba2db368ef7703ebfff01accbc97f3fb4d2 100644 (file)
--- 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 83d659d4dcc2c2625ba291cf967e073263ffe61a..1591b7e17e1f519c2d92dc19514cc36d9ac1ed56 100644 (file)
--- 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 0aa6f177aad0bdc272914fa4b52aea3f98aae7b1..aa859cba4fdb416513361d7ba4e291ab74a256ae 100644 (file)
--- 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: