[ARVADOS] updated: 1.1.3-257-g48a362b
Git user
git at public.curoverse.com
Fri Mar 30 17:06:53 EDT 2018
Summary of changes:
.../tests/wf/{scatter2.cwl => runin-reqs-wf.cwl} | 42 ++++++----------------
.../tests/wf/{scatter2.cwl => runin-reqs-wf2.cwl} | 40 ++++++---------------
.../tests/wf/{scatter2.cwl => runin-reqs-wf3.cwl} | 40 ++++++---------------
.../tests/wf/{scatter2.cwl => runin-reqs-wf4.cwl} | 40 ++++++---------------
4 files changed, 44 insertions(+), 118 deletions(-)
copy sdk/cwl/tests/wf/{scatter2.cwl => runin-reqs-wf.cwl} (51%)
copy sdk/cwl/tests/wf/{scatter2.cwl => runin-reqs-wf2.cwl} (56%)
copy sdk/cwl/tests/wf/{scatter2.cwl => runin-reqs-wf3.cwl} (56%)
copy sdk/cwl/tests/wf/{scatter2.cwl => runin-reqs-wf4.cwl} (56%)
via 48a362bb93d1e53e879a563da85aecd070987f30 (commit)
from af2ec135f1b634e67205db1752d5ad65aa9c87b9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 48a362bb93d1e53e879a563da85aecd070987f30
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Fri Mar 30 17:06:25 2018 -0400
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 at 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
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
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
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
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
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list