Merge branch 'patch-1' of https://github.com/mr-c/arvados into mr-c-patch-1

[arvados.git] / sdk / cwl / tests / federation / arvbox-make-federation.cwl

diff --git a/sdk/cwl/tests/federation/arvbox-make-federation.cwl b/sdk/cwl/tests/federation/arvbox-make-federation.cwl
index 81b542057c2d780f4e2eb1a87f64bacb25ecf7bf..ed3f1d1384b4fc4f11b535007c749ec76fc26bb3 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:
@@ -27,6 +27,15 @@ inputs:
     default:
       class: File
       location: ../../../../tools/arvbox/bin/arvbox
+  branch:
+    type: string
+    default: master
+  logincluster:
+    type: boolean
+    default: false
+  arvbox_mode:
+    type: string?
+    default: "dev"
 outputs:
   arvados_api_token:
     type: string
@@ -58,16 +67,18 @@ steps:
       containers: containers
       arvbox_base: arvbox_base
     out: [arvbox_data]
-    run: arvbox/mkdir.cwl
+    run: arvboxcwl/mkdir.cwl
   start:
     in:
       container_name: containers
       arvbox_data: mkdir/arvbox_data
       arvbox_bin: arvbox
+      branch: branch
+      arvbox_mode: arvbox_mode
     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
@@ -76,13 +87,14 @@ steps:
       cluster_hosts: start/container_host
       arvbox_data: start/arvbox_data_out
       arvbox_bin: arvbox
+      logincluster: logincluster
     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