Merge branch 'use_mktemp' of https://github.com/golharam/arvados into golharam-use_mktemp

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

diff --git a/sdk/python/tests/fed-migrate/arvbox-make-federation.cwl b/sdk/python/tests/fed-migrate/arvbox-make-federation.cwl
index c3fcbdcb3f5578f766c2dbea25c39aac6e60fb67..cc0fb0fe061af0135f585f3fbc2b23976997c185 100644 (file)
--- a/sdk/python/tests/fed-migrate/arvbox-make-federation.cwl
+++ b/sdk/python/tests/fed-migrate/arvbox-make-federation.cwl
@@ -1,10 +1,16 @@
-cwlVersion: v1.0
+cwlVersion: v1.1
 class: Workflow
 $namespaces:
   arv: "http://arvados.org/cwl#"
   cwltool: "http://commonwl.org/cwltool#"
+
 inputs:
   arvbox_base: Directory
+  branch:
+    type: string
+    default: master
+  arvbox_mode:
+    type: string?
 outputs:
   arvados_api_hosts:
     type: string[]
@@ -18,13 +24,25 @@ outputs:
   arvbox_containers:
     type: string[]
     outputSource: start/arvbox_containers
+  arvbox_bin:
+    type: File
+    outputSource: start/arvbox_bin
+  refspec:
+    type: string
+    outputSource: branch
 requirements:
   SubworkflowFeatureRequirement: {}
-  cwltool:LoadListingRequirement:
+  ScatterFeatureRequirement: {}
+  StepInputExpressionRequirement: {}
+  LoadListingRequirement:
     loadListing: no_listing
 steps:
   start:
     in:
       arvbox_base: arvbox_base
-    out: [arvados_api_hosts, arvados_cluster_ids, arvado_api_host_insecure, superuser_tokens, arvbox_containers]
+      branch: branch
+      arvbox_mode: arvbox_mode
+      logincluster:
+        default: true
+    out: [arvados_api_hosts, arvados_cluster_ids, arvado_api_host_insecure, superuser_tokens, arvbox_containers, arvbox_bin]
     run: ../../../cwl/tests/federation/arvbox-make-federation.cwl