17879: Add test that acr doesn't fail on sbg fields

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/sdk/cwl/tests/17879-ignore-sbg-fields-job.yml b/sdk/cwl/tests/17879-ignore-sbg-fields-job.yml
new file mode 100644 (file)
index 0000000..26e9d12
--- /dev/null
+++ b/sdk/cwl/tests/17879-ignore-sbg-fields-job.yml
@@ -0,0 +1,5 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+sampleName: woble

diff --git a/sdk/cwl/tests/17879-ignore-sbg-fields.cwl b/sdk/cwl/tests/17879-ignore-sbg-fields.cwl
new file mode 100644 (file)
index 0000000..131fd0f
--- /dev/null
+++ b/sdk/cwl/tests/17879-ignore-sbg-fields.cwl
@@ -0,0 +1,37 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+$namespaces:
+  sbg: https://www.sevenbridges.com/
+class: "Workflow"
+cwlVersion: v1.1
+label: "check that sbg x/y fields are correctly ignored"
+inputs:
+  - id: sampleName
+    type: string
+    label: Sample name
+    'sbg:x': -22
+    'sbg:y': 33.4296875
+outputs:
+  - id: outstr
+    type: string
+    outputSource: step1/outstr
+steps:
+  step1:
+    in:
+      sampleName: sampleName
+    out: [outstr]
+    run:
+      class: CommandLineTool
+      inputs:
+        sampleName: string
+      stdout: out.txt
+      outputs:
+        outstr:
+          type: string
+          outputBinding:
+            glob: out.txt
+            loadContents: true
+            outputEval: $(self[0].contents)
+      arguments: [echo, "-n", "foo", $(inputs.sampleName), "bar"]

diff --git a/sdk/cwl/tests/arvados-tests.yml b/sdk/cwl/tests/arvados-tests.yml
index 717636cd3c6746e6b2e4429fff9a8ad7019d236f..ae22d65f4db22f3a2b285320d1501a79d0a2e139 100644 (file)
--- a/sdk/cwl/tests/arvados-tests.yml
+++ b/sdk/cwl/tests/arvados-tests.yml
@@ -433,3 +433,9 @@
     "val": "keep:f225e6259bdd63bc7240599648dde9f1+97/hg19.fa"
   tool: 17858-pack-visit-crash.cwl
   doc: "Test issue 17858 - keep ref default inputs on ExpressionTool"
+
+- job: 17879-ignore-sbg-fields-job.yml
+  output:
+    "outstr": "foo woble bar"
+  tool: 17879-ignore-sbg-fields.cwl
+  doc: "Test issue 17879 - ignores sbg fields"