feat: Move variables to variable-mapping

Author: Alan Christie

tests/workflow-definitions/duplicate-workflow-variable-names.yaml

@@ -3,7 +3,7 @@ kind: DataManagerWorkflow
 kind-version: "2024.1"
 name: duplicate-workflow-variable-names
 description: A workflow with a duplicate variable name in the input and output
-variables:
+variable-mapping:
   inputs:
   - name: x
     type: squonk/x-smiles

tests/workflow-definitions/simple-python-molprops-with-options.yaml

@@ -3,7 +3,7 @@ kind: DataManagerWorkflow
 kind-version: "2024.1"
 name: python-workflow
 description: A simple python experimental workflow
-variables:
+variable-mapping:
   inputs:
   - name: candidateMolecules
     type: squonk/x-smiles

tests/workflow-definitions/simple-python-molprops.yaml

@@ -3,7 +3,7 @@ kind: DataManagerWorkflow
 kind-version: "2024.1"
 name: python-workflow
 description: A simple python experimental workflow
-variables:
+variable-mapping:
   inputs:
   - name: candidateMolecules
     type: squonk/x-smiles

tests/workflow-definitions/simple-python-parallel.yaml

@@ -3,7 +3,7 @@ kind: DataManagerWorkflow
 kind-version: "2024.1"
 name: python-workflow
 description: A simple branching workflow
-variables:
+variable-mapping:
   inputs:
   - name: candidateMolecules
     type: squonk/x-smiles

tests/workflow-definitions/workflow-options.yaml

@@ -3,7 +3,7 @@ kind: DataManagerWorkflow
 kind-version: "2024.1"
 name: workflow-options
 description: Illustrate the use of workflow options
-variables:
+variable-mapping:
   options:
   - name: variableWithoutDefault
     as:

workflow/workflow-schema.yaml

@@ -28,6 +28,14 @@ properties:
     items:
       $ref: "#/definitions/step"
   variables:
+    # A Job-compliant set of variable declarations for the workflow.
+    # This block structure is a reproduction of that used in Job definitions
+    # and, like JObs, has no current schema.
+    type: object
+    additionalProperties: false
+  variable-mapping:
+    # Workflow-specific variable declarations,
+    # used (at the moment) to map workflow variables to steps.
     type: object
     additionalProperties: false
     properties: