Make arch field unsupported in the spec

The `arch` field is currently special, and unsupported if it is set in the hardware field. Fix this discrepancy and make sure a warning is show so users are aware to not use it here. Signed-off-by: Miroslav Vadkerti <[email protected]>
teemtee · Dec 7, 2023 · 395aa33 · 395aa33
1 parent 38eacf7
commit 395aa33
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/spec/hardware/arch.fmf b/spec/hardware/arch.fmf
@@ -7,12 +7,15 @@ description: |
        # String, any of well-known short architecture names.
        arch: "aarch64"|"i386"|"ppc64"|"ppc64le"|"s390x"|"x86_64"|...
 
+    .. warning::
+
+        This field is not supported under ``hardware``. It is planned
+        to be supported in the future. Use the ``arch`` field of specific
+        provision plugins to select the architecture. If this field
+        is used in Testing Farm's hardware requirements the request
+        will abort.
+
 example:
   - |
     # Require a good old x86_64 box
     arch: x86_64
-
-link:
-  - implemented-by: /tmt/steps/provision/artemis.py
-  - implemented-by: /tmt/steps/provision/mrack.py
-  - implemented-by: /tmt/steps/provision/testcloud.py
diff --git a/tests/unit/test_schemas.py b/tests/unit/test_schemas.py
@@ -119,7 +119,7 @@ def test_plans_schema(tree, plan):
         """
             ---
 
-            arch: x86_64
+            #arch: x86_64
             boot:
                 method: bios
             compatible:
@@ -160,7 +160,7 @@ def test_plans_schema(tree, plan):
             ---
 
             and:
-              - arch: x86_64
+              #- arch: x86_64
               - cpu:
                   model-name: foo
               - memory: 8 GiB

diff --git a/tmt/schemas/provision/hardware.yaml b/tmt/schemas/provision/hardware.yaml
@@ -11,8 +11,9 @@ $schema: http://json-schema.org/draft-07/schema
 
 definitions:
   # HW requirements: `arch`
-  arch:
-    type: string
+  # NOTE: not yet supported in hardware
+  # arch:
+  #   type: string
 
   # HW requirements: `boot` block
   boot:
@@ -298,8 +299,8 @@ definitions:
     type: object
 
     properties:
-      arch:
-        "$ref": "#/definitions/arch"
+      # arch:
+      #   "$ref": "#/definitions/arch"
 
       boot:
         "$ref": "#/definitions/boot"