diff --git a/docs/api/schema/JobScenarios-01.yaml b/docs/api/schema/JobScenarios-01.yaml index 46a9cb7986e..7e06a2cb92e 100644 --- a/docs/api/schema/JobScenarios-01.yaml +++ b/docs/api/schema/JobScenarios-01.yaml @@ -4,9 +4,9 @@ description: Definitions for openQA job scenarios type: object additionalProperties: false required: -- job_templates + - job_templates patternProperties: - '^\.[a-z0-9_]+$': + ^\.[a-z0-9_]+$: type: object description: Definitions that can be re-used @@ -15,7 +15,7 @@ properties: type: object additionalProperties: false patternProperties: - '^[A-Za-z0-9._*-]+$': + ^[A-Za-z0-9._*-]+$: type: object description: The name of a product (medium) required: @@ -40,14 +40,14 @@ properties: description: Additional test variables to be set additionalProperties: false patternProperties: - '^[A-Z_+]+[A-Z0-9_]*$': + ^[A-Z_+]+[A-Z0-9_]*$: type: string machines: type: object additionalProperties: false patternProperties: - '^[A-Za-z0-9._*-]+$': + ^[A-Za-z0-9._*-]+$: type: object description: The name of a machine required: @@ -66,7 +66,7 @@ properties: type: object additionalProperties: false patternProperties: - '^[A-Za-z\s0-9_*.+-]+$': + ^[A-Za-z\s0-9_*.+-]+$: type: object description: The name of the job template additionalProperties: false diff --git a/docs/api/schema/JobTemplates-01.yaml b/docs/api/schema/JobTemplates-01.yaml index c058ab6b0b4..393799993a9 100644 --- a/docs/api/schema/JobTemplates-01.yaml +++ b/docs/api/schema/JobTemplates-01.yaml @@ -4,10 +4,10 @@ description: openQA job template type: object additionalProperties: false required: -- products -- scenarios + - products + - scenarios patternProperties: - '^\.[a-z0-9_]+$': + ^\.[a-z0-9_]+$: type: object description: Definitions that can be re-used @@ -17,60 +17,60 @@ properties: type: object additionalProperties: false patternProperties: - '^[a-z0-9_]+$': + ^[a-z0-9_]+$: type: object description: The architecture of the test suite(s) eg. ppc64le patternProperties: - '^.*$': + ^.*$: type: array description: The product to run the test suite(s) on items: anyOf: - - type: string - description: Name of a test suite name - - type: object - maxProperties: 1 - description: A test suite with machine and/or priority value specified, or a custom job template name if testsuite was specified - additionalProperties: false - patternProperties: - &testsuite-pattern '^[A-Za-z\s0-9_*.+-]+$': - type: object - additionalProperties: false - properties: - machine: &machine-definition - oneOf: - - type: string - - type: array - items: + - type: string + description: Name of a test suite name + - type: object + maxProperties: 1 + description: A test suite with machine and/or priority value specified, or a custom job template name if testsuite was specified + additionalProperties: false + patternProperties: + &testsuite-pattern ^[A-Za-z\s0-9_*.+-]+$: + type: object + additionalProperties: false + properties: + machine: &machine-definition + oneOf: - type: string - priority: &priority-definition - type: number - settings: &settings-definition - type: object - description: Additional test variables to be set - additionalProperties: false - patternProperties: - '^[A-Z_+]+[A-Z0-9_]*$': - type: string - testsuite: - type: [string, 'null'] - pattern: *testsuite-pattern - description: The test suite this scenario is based on if a custom job template name was used - description: - type: string - description: The description of the job template + - type: array + items: + - type: string + priority: &priority-definition + type: number + settings: &settings-definition + type: object + description: Additional test variables to be set + additionalProperties: false + patternProperties: + ^[A-Z_+]+[A-Z0-9_]*$: + type: string + testsuite: + type: [string, 'null'] + pattern: *testsuite-pattern + description: The test suite this scenario is based on if a custom job template name was used + description: + type: string + description: The description of the job template defaults: description: A set of architectures with default configurations type: object additionalProperties: false patternProperties: - '^[a-z0-9_]+$': + ^[a-z0-9_]+$: type: object description: The architecture to define a default configuration for eg. ppc64le required: - - machine - - priority + - machine + - priority additionalProperties: false properties: machine: *machine-definition @@ -81,7 +81,7 @@ properties: type: object additionalProperties: false patternProperties: - '^[A-Za-z0-9._*-]+$': + ^[A-Za-z0-9._*-]+$: type: object description: The name of a product (medium) required: diff --git a/docs/api/testapi.html b/docs/api/testapi.html index b2c261e40c4..5996008ee23 100644 --- a/docs/api/testapi.html +++ b/docs/api/testapi.html @@ -2078,7 +2078,7 @@