Merge pull request common-workflow-language#314 from common-workflow-…

…language/test-requirements-on-steps Add test for requirements/hints on workflow steps.
qiukunlong · Sep 15, 2016 · e831c20 · e831c20
2 parents 7679adb + 8cad6f1
commit e831c20
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 5 deletions.
diff --git a/v1.0/conformance_test_v1.0.yaml b/v1.0/conformance_test_v1.0.yaml
@@ -287,6 +287,16 @@
   tool: v1.0/env-wf2.cwl
   doc: Test requirements override hints
 
+- job: v1.0/env-job.json
+  output:
+    out:
+      class: File
+      checksum: sha1$cdc1e84968261d6a7575b5305945471f8be199b6
+      location: out
+      size: 9
+  tool: v1.0/env-wf3.cwl
+  doc: Test requirements on workflow steps
+
 - job: v1.0/empty.json
   output: {count_output: 16}
   tool: v1.0/count-lines9-wf.cwl

diff --git a/v1.0/v1.0/cat5-tool.cwl b/v1.0/v1.0/cat5-tool.cwl
@@ -1,11 +1,13 @@
 #!/usr/bin/env cwl-runner
+$namespaces:
+  ex: http://example.com/
 cwlVersion: v1.0
 class: CommandLineTool
 doc: "Print the contents of a file to stdout using 'cat' running in a docker container."
 hints:
   DockerRequirement:
     dockerPull: "debian:wheezy"
-  BlibberBlubberFakeRequirement:
+  ex:BlibberBlubberFakeRequirement:
     fakeField: fraggleFroogle
 inputs:
   file1:

diff --git a/v1.0/v1.0/env-wf1.cwl b/v1.0/v1.0/env-wf1.cwl
@@ -11,8 +11,7 @@ outputs:
       outputSource: step1/out
 
 requirements:
-  - class: SubworkflowFeatureRequirement
-  - class: EnvVarRequirement
+  EnvVarRequirement:
     envDef:
       TEST_ENV: override
 

diff --git a/v1.0/v1.0/env-wf2.cwl b/v1.0/v1.0/env-wf2.cwl
@@ -11,8 +11,7 @@ outputs:
       outputSource: step1/out
 
 requirements:
-  - class: SubworkflowFeatureRequirement
-  - class: EnvVarRequirement
+  EnvVarRequirement:
     envDef:
       TEST_ENV: override
 

diff --git a/v1.0/v1.0/env-wf3.cwl b/v1.0/v1.0/env-wf3.cwl
@@ -0,0 +1,22 @@
+#!/usr/bin/env cwl-runner
+class: Workflow
+cwlVersion: v1.0
+
+inputs:
+    in: string
+
+outputs:
+    out:
+      type: File
+      outputSource: step1/out
+
+steps:
+  step1:
+    run: env-tool2.cwl
+    requirements:
+      EnvVarRequirement:
+        envDef:
+          TEST_ENV: override
+    in:
+      in: in
+    out: [out]