projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge 21447: closes #21447
[arvados.git]
/
sdk
/
cwl
/
tests
/
wf
/
runin-reqs-wf.cwl
diff --git
a/sdk/cwl/tests/wf/runin-reqs-wf.cwl
b/sdk/cwl/tests/wf/runin-reqs-wf.cwl
index e8bbc08d8a27ae12deee011d7e93d9dca24cc5fe..3e229e6652188c5c1680f04b7fb6eba6b5ebd334 100644
(file)
--- a/
sdk/cwl/tests/wf/runin-reqs-wf.cwl
+++ b/
sdk/cwl/tests/wf/runin-reqs-wf.cwl
@@
-15,8
+15,7
@@
inputs:
default:
class: File
location: check_mem.py
default:
class: File
location: check_mem.py
-outputs:
- out: []
+outputs: []
requirements:
SubworkflowFeatureRequirement: {}
ScatterFeatureRequirement: {}
requirements:
SubworkflowFeatureRequirement: {}
ScatterFeatureRequirement: {}
@@
-24,7
+23,7
@@
requirements:
StepInputExpressionRequirement: {}
hints:
DockerRequirement:
StepInputExpressionRequirement: {}
hints:
DockerRequirement:
- dockerPull: arvados/jobs:
1.4.0.20190604172024
+ dockerPull: arvados/jobs:
2.2.2
steps:
substep:
in:
steps:
substep:
in:
@@
-34,7
+33,7
@@
steps:
hints:
- class: arv:RunInSingleContainer
- class: ResourceRequirement
hints:
- class: arv:RunInSingleContainer
- class: ResourceRequirement
- ramMin: $(inputs.count*32)
+ ramMin: $(
96+
inputs.count*32)
- class: arv:APIRequirement
scatter: count
run:
- class: arv:APIRequirement
scatter: count
run:
@@
-58,4
+57,4
@@
steps:
type: int
script: File
outputs: []
type: int
script: File
outputs: []
- arguments: [python, $(inputs.script), $(inputs.count * 32)]
+ arguments: [python, $(inputs.script), $(
96+
inputs.count * 32)]