feat: Adds test-groups and run-groups

Author: Alan Christie

decoder/job-definition-schema.yaml

@@ -30,6 +30,8 @@ properties:
     pattern: '^[a-z]{1}[a-z0-9-]*$'
   jobs:
     $ref: '#/definitions/job-identity'
+  test-groups:
+    $ref: '#/definitions/test-groups'
 required:
 - kind
 - kind-version
@@ -323,6 +325,26 @@ definitions:
     maxLength: 63
     pattern: '^[a-z]([a-z0-9-]*[a-z0-9])?$'
 
+  # Test groups.
+  # A list of groups that have a name and optional compose-file.
+  test-groups:
+    type: array
+    items:
+      type: object
+      additionalProperties: false
+      properties:
+        name:
+          type: string
+          minLength: 1
+          maxLength: 63
+          pattern: '^[a-z]{1}[a-z0-9-]*$'
+        compose-file:
+          type: string
+          pattern: '^docker-compose(-[a-z0-9-]{1,})?.yaml$'
+      required:
+      - name
+    additionalProperties: false
+
   # An individual Test.
   # Consists of a identity (i.e. 'test-filter-molecules')
   # followed by a Test object.
@@ -346,6 +368,10 @@ definitions:
     type: object
     additionalProperties: false
     properties:
+      run-groups:
+        type: array
+        items:
+          $ref: '#/definitions/run-group'
       run-level:
         type: integer
         minimum: 1
@@ -375,6 +401,21 @@ definitions:
         required:
         - exitCode
 
+  run-group:
+    type: object
+    additionalProperties: false
+    properties:
+      name:
+        type: string
+        minLength: 1
+        maxLength: 63
+        pattern: '^[a-z]{1}[a-z0-9-]*$'
+      ordinal:
+        type: integer
+        minimum: 1
+    required:
+    - name
+
   # A test input, a string or array of strings
   test-input:
     type: object

tests/test_validate_job_schema.py

@@ -223,3 +223,46 @@ def test_validate_test_option_array():
 
     # Assert
     assert error is None
+
+
+def test_validate_test_groups():
+    # Arrange
+    text: Dict[str, Any] = deepcopy(_MINIMAL)
+    text["test-groups"] = [{"name": "demo-1"}, {"name": "demo-2"}]
+
+    # Act
+    error = decoder.validate_job_schema(text)
+
+    # Assert
+    assert error is None
+
+
+def test_validate_test_groups_with_compose():
+    # Arrange
+    text: Dict[str, Any] = deepcopy(_MINIMAL)
+    text["test-groups"] = [
+        {"name": "demo-1", "compose-file": "docker-compose-abc.yaml"}
+    ]
+
+    # Act
+    error = decoder.validate_job_schema(text)
+
+    # Assert
+    assert error is None
+
+
+def test_validate_test_run_groups():
+    # Arrange
+    text: Dict[str, Any] = deepcopy(_MINIMAL)
+    demo_job: Dict[str, Any] = text["jobs"]["demo"]
+    demo_job["tests"] = {
+        "basic-1": {
+            "run-groups": [{"name": "demo-1"}, {"name": "demo-2", "ordinal": 1}],
+        },
+    }
+
+    # Act
+    error = decoder.validate_job_schema(text)
+
+    # Assert
+    assert error is None