17417: Merge branch 'main' into 17417-add-arm64

[arvados.git] / sdk / cwl / tests / wf / runin-reqs-wf2.cwl

diff --git a/sdk/cwl/tests/wf/runin-reqs-wf2.cwl b/sdk/cwl/tests/wf/runin-reqs-wf2.cwl
index 50db901ee49622b7d3dace8eee8983bb3d8dd70a..4bde6c562c1ed66fbbabbe1a9f509c6fcee9fe57 100644 (file)
--- a/sdk/cwl/tests/wf/runin-reqs-wf2.cwl
+++ b/sdk/cwl/tests/wf/runin-reqs-wf2.cwl
@@ -7,9 +7,14 @@ cwlVersion: v1.0
 $namespaces:
   arv: "http://arvados.org/cwl#"
 inputs:
-  sleeptime:
+  count:
     type: int[]
     default: [1, 2, 3, 4]
+  script:
+    type: File
+    default:
+      class: File
+      location: check_mem.py
 outputs:
   out: []
 requirements:
@@ -17,34 +22,41 @@ requirements:
   ScatterFeatureRequirement: {}
   InlineJavascriptRequirement: {}
   StepInputExpressionRequirement: {}
+hints:
+  DockerRequirement:
+    dockerPull: arvados/jobs:2.2.2
 steps:
   substep:
     in:
-      sleeptime: sleeptime
+      count: count
+      script: script
     out: []
     hints:
       - class: arv:RunInSingleContainer
-    scatter: sleeptime
+      - class: arv:APIRequirement
+    scatter: count
     run:
       class: Workflow
       id: mysub
       inputs:
-        sleeptime: int
+        count: int
+        script: File
       outputs: []
       hints:
-      - class: ResourceRequirement
-        ramMin: $(inputs.sleeptime*4)
+        - class: ResourceRequirement
+          ramMin: $(96+inputs.count*32)
       steps:
         sleep1:
           in:
-            sleeptime: sleeptime
+            count: count
+            script: script
           out: []
           run:
             class: CommandLineTool
             id: subtool
             inputs:
-              sleeptime:
+              count:
                 type: int
-                inputBinding: {position: 1}
+              script: File
             outputs: []
-            baseCommand: sleep
+            arguments: [python, $(inputs.script), $(96+inputs.count * 32)]