Now supports image memory and cores

Author: Alan Christie

decoder/schema.yaml

@@ -130,13 +130,32 @@ definitions:
         default: simple
       pull-secret:
         $ref: '#/definitions/rfc-1035-name'
+      memory:
+        $ref: '#/definitions/memory'
+      cores:
+        $ref: '#/definitions/cores'
       environment:
         $ref: '#/definitions/environment'
     required:
     - name
     - tag
     - project-directory
 
+  # A kubernetes CPU (cores) declaration.
+  # Here we only accept numbers in the range 1 to 32.
+  cores:
+    type: integer
+    minimum: 1
+    maximum: 32
+
+  # A kubernetes memory declaration.
+  # Here we only accept between 1 and 4 numbers
+  # and force a restricted suffix (Mi or Gi)
+  memory:
+    type: string
+    minLength: 1
+    pattern: '^[1-9][0-9]{0,3}(Gi|Mi)$'
+
   # Image environment definitions.
   environment:
     type: array

tests/test_validate_job_schema.py

@@ -83,3 +83,55 @@ def test_validate_image_env_from_secret():
 
     # Assert
     assert error is None
+
+
+def test_validate_image_memory_32gi():
+    # Arrange
+    text: Dict[str, Any] = deepcopy(_MINIMAL)
+    demo_job: Dict[str, Any] = text['jobs']['demo']
+    demo_job['image']['memory'] = '32Gi'
+
+    # Act
+    error = decoder.validate_job_schema(text)
+
+    # Assert
+    assert error is None
+
+
+def test_validate_image_memory_500Mi():
+    # Arrange
+    text: Dict[str, Any] = deepcopy(_MINIMAL)
+    demo_job: Dict[str, Any] = text['jobs']['demo']
+    demo_job['image']['memory'] = '500Mi'
+
+    # Act
+    error = decoder.validate_job_schema(text)
+
+    # Assert
+    assert error is None
+
+
+def test_validate_image_cores_1():
+    # Arrange
+    text: Dict[str, Any] = deepcopy(_MINIMAL)
+    demo_job: Dict[str, Any] = text['jobs']['demo']
+    demo_job['image']['cores'] = 1
+
+    # Act
+    error = decoder.validate_job_schema(text)
+
+    # Assert
+    assert error is None
+
+
+def test_validate_image_cores_32():
+    # Arrange
+    text: Dict[str, Any] = deepcopy(_MINIMAL)
+    demo_job: Dict[str, Any] = text['jobs']['demo']
+    demo_job['image']['cores'] = 32
+
+    # Act
+    error = decoder.validate_job_schema(text)
+
+    # Assert
+    assert error is None