15028: Update cwltool/schema-salad deps, fix tests

[arvados.git] / sdk / cwl / tests / wf / scatter2_subwf.cwl

diff --git a/sdk/cwl/tests/wf/scatter2_subwf.cwl b/sdk/cwl/tests/wf/scatter2_subwf.cwl
index 0ae1cf04f05ed57fd57b4832cac207d8cdf629c1..ecd36026f2e6c487667be13620a244777ba3abd8 100644 (file)
--- a/sdk/cwl/tests/wf/scatter2_subwf.cwl
+++ b/sdk/cwl/tests/wf/scatter2_subwf.cwl
@@ -1,33 +1,87 @@
-$graph:
-- class: Workflow
-  hints:
-  - {class: 'http://arvados.org/cwl#RunInSingleContainer'}
-  id: '#main'
-  inputs:
-  - {id: '#main/sleeptime', type: int}
-  outputs:
-  - {id: '#main/out', outputSource: '#main/sleep1/out', type: string}
-  requirements:
-  - {class: InlineJavascriptRequirement}
-  - {class: ScatterFeatureRequirement}
-  - {class: StepInputExpressionRequirement}
-  - {class: SubworkflowFeatureRequirement}
-  steps:
-  - id: '#main/sleep1'
-    in:
-    - {id: '#main/sleep1/blurb', valueFrom: "${\n  return String(inputs.sleeptime)\
-        \ + \"b\";\n}\n"}
-    - {id: '#main/sleep1/sleeptime', source: '#main/sleeptime'}
-    out: ['#main/sleep1/out']
-    run:
-      baseCommand: sleep
-      class: CommandLineTool
-      inputs:
-      - id: '#main/sleep1/sleeptime'
-        inputBinding: {position: 1}
-        type: int
-      outputs:
-      - id: '#main/sleep1/out'
-        outputBinding: {outputEval: out}
-        type: string
-cwlVersion: v1.0
\ No newline at end of file
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+{
+  "$graph": [
+    {
+      "class": "Workflow",
+      "cwlVersion": "v1.1.0-dev1",
+      "hints": [],
+      "id": "#main",
+      "inputs": [
+        {
+          "id": "#main/fileblub",
+          "type": "File"
+        },
+        {
+          "id": "#main/sleeptime",
+          "type": "int"
+        }
+      ],
+      "outputs": [
+        {
+          "id": "#main/out",
+          "outputSource": "#main/sleep1/out",
+          "type": "string"
+        }
+      ],
+      "requirements": [
+        {
+          "class": "InlineJavascriptRequirement"
+        },
+        {
+          "class": "ScatterFeatureRequirement"
+        },
+        {
+          "class": "StepInputExpressionRequirement"
+        },
+        {
+          "class": "SubworkflowFeatureRequirement"
+        }
+      ],
+      "steps": [
+        {
+          "id": "#main/sleep1",
+          "in": [
+            {
+              "id": "#main/sleep1/blurb",
+              "valueFrom": "${\n  return String(inputs.sleeptime) + \"b\";\n}\n"
+            },
+            {
+              "id": "#main/sleep1/sleeptime",
+              "source": "#main/sleeptime"
+            }
+          ],
+          "out": [
+            "#main/sleep1/out"
+          ],
+          "run": {
+            "baseCommand": "sleep",
+            "class": "CommandLineTool",
+            "id": "#main/sleep1/run/subtool",
+            "inputs": [
+              {
+                "id": "#main/sleep1/run/subtool/sleeptime",
+                "inputBinding": {
+                  "position": 1
+                },
+                "type": "int"
+              }
+            ],
+            "outputs": [
+              {
+                "id": "#main/sleep1/run/subtool/out",
+                "outputBinding": {
+                  "outputEval": "out"
+                },
+                "type": "string"
+              }
+            ]
+          }
+        }
+      ]
+    }
+  ],
+  "cwlVersion": "v1.1.0-dev1"
+}
\ No newline at end of file