13301: Add some tests, but I'm not sure the best way to hook them into

automated testing.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/sdk/cwl/tests/wf/runin-reqs-wf.cwl b/sdk/cwl/tests/wf/runin-reqs-wf.cwl
new file mode 100644 (file)
index 0000000..8e3557e
--- /dev/null
+++ b/sdk/cwl/tests/wf/runin-reqs-wf.cwl
@@ -0,0 +1,48 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+class: Workflow
+cwlVersion: v1.0
+$namespaces:
+  arv: "http://arvados.org/cwl#"
+inputs:
+  sleeptime:
+    type: int[]
+    default: [1, 2, 3, 4]
+outputs:
+  out: []
+requirements:
+  SubworkflowFeatureRequirement: {}
+  ScatterFeatureRequirement: {}
+  InlineJavascriptRequirement: {}
+  StepInputExpressionRequirement: {}
+steps:
+  substep:
+    in:
+      sleeptime: sleeptime
+    out: []
+    hints:
+      - class: arv:RunInSingleContainer
+      - class: ResourceRequirement
+        ramMin: $(inputs.sleeptime*4)
+    scatter: sleeptime
+    run:
+      class: Workflow
+      id: mysub
+      inputs:
+        sleeptime: int
+      outputs: []
+      steps:
+        sleep1:
+          in:
+            sleeptime: sleeptime
+          out: []
+          run:
+            class: CommandLineTool
+            id: subtool
+            inputs:
+              sleeptime:
+                type: int
+            outputs: []
+            baseCommand: [cat, /proc/meminfo]

diff --git a/sdk/cwl/tests/wf/runin-reqs-wf2.cwl b/sdk/cwl/tests/wf/runin-reqs-wf2.cwl
new file mode 100644 (file)
index 0000000..50db901
--- /dev/null
+++ b/sdk/cwl/tests/wf/runin-reqs-wf2.cwl
@@ -0,0 +1,50 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+class: Workflow
+cwlVersion: v1.0
+$namespaces:
+  arv: "http://arvados.org/cwl#"
+inputs:
+  sleeptime:
+    type: int[]
+    default: [1, 2, 3, 4]
+outputs:
+  out: []
+requirements:
+  SubworkflowFeatureRequirement: {}
+  ScatterFeatureRequirement: {}
+  InlineJavascriptRequirement: {}
+  StepInputExpressionRequirement: {}
+steps:
+  substep:
+    in:
+      sleeptime: sleeptime
+    out: []
+    hints:
+      - class: arv:RunInSingleContainer
+    scatter: sleeptime
+    run:
+      class: Workflow
+      id: mysub
+      inputs:
+        sleeptime: int
+      outputs: []
+      hints:
+      - class: ResourceRequirement
+        ramMin: $(inputs.sleeptime*4)
+      steps:
+        sleep1:
+          in:
+            sleeptime: sleeptime
+          out: []
+          run:
+            class: CommandLineTool
+            id: subtool
+            inputs:
+              sleeptime:
+                type: int
+                inputBinding: {position: 1}
+            outputs: []
+            baseCommand: sleep

diff --git a/sdk/cwl/tests/wf/runin-reqs-wf3.cwl b/sdk/cwl/tests/wf/runin-reqs-wf3.cwl
new file mode 100644 (file)
index 0000000..352a919
--- /dev/null
+++ b/sdk/cwl/tests/wf/runin-reqs-wf3.cwl
@@ -0,0 +1,50 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+class: Workflow
+cwlVersion: v1.0
+$namespaces:
+  arv: "http://arvados.org/cwl#"
+inputs:
+  sleeptime:
+    type: int[]
+    default: [1, 2, 3, 4]
+outputs:
+  out: []
+requirements:
+  SubworkflowFeatureRequirement: {}
+  ScatterFeatureRequirement: {}
+  InlineJavascriptRequirement: {}
+  StepInputExpressionRequirement: {}
+steps:
+  substep:
+    in:
+      sleeptime: sleeptime
+    out: []
+    hints:
+      - class: arv:RunInSingleContainer
+    scatter: sleeptime
+    run:
+      class: Workflow
+      id: mysub
+      inputs:
+        sleeptime: int
+      outputs: []
+      steps:
+        sleep1:
+          in:
+            sleeptime: sleeptime
+          out: []
+          run:
+            class: CommandLineTool
+            id: subtool
+            hints:
+              - class: ResourceRequirement
+                ramMin: $(inputs.sleeptime*4)
+            inputs:
+              sleeptime:
+                type: int
+                inputBinding: {position: 1}
+            outputs: []
+            baseCommand: sleep

diff --git a/sdk/cwl/tests/wf/runin-reqs-wf4.cwl b/sdk/cwl/tests/wf/runin-reqs-wf4.cwl
new file mode 100644 (file)
index 0000000..75f50d2
--- /dev/null
+++ b/sdk/cwl/tests/wf/runin-reqs-wf4.cwl
@@ -0,0 +1,50 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+class: Workflow
+cwlVersion: v1.0
+$namespaces:
+  arv: "http://arvados.org/cwl#"
+inputs:
+  sleeptime:
+    type: int[]
+    default: [1, 2, 3, 4]
+outputs:
+  out: []
+requirements:
+  SubworkflowFeatureRequirement: {}
+  ScatterFeatureRequirement: {}
+  InlineJavascriptRequirement: {}
+  StepInputExpressionRequirement: {}
+steps:
+  substep:
+    in:
+      sleeptime: sleeptime
+    out: []
+    hints:
+      - class: arv:RunInSingleContainer
+    scatter: sleeptime
+    run:
+      class: Workflow
+      id: mysub
+      inputs:
+        sleeptime: int
+      outputs: []
+      steps:
+        sleep1:
+          in:
+            sleeptime: sleeptime
+          out: []
+          run:
+            class: CommandLineTool
+            id: subtool
+            hints:
+              - class: ResourceRequirement
+                ramMin: 8
+            inputs:
+              sleeptime:
+                type: int
+                inputBinding: {position: 1}
+            outputs: []
+            baseCommand: sleep