PR#7: Use a single schema for koji builds & brew builds - fedora-ci/messages

fedora-ci / messages

#7 Use a single schema for koji builds & brew builds

Merged 5 years ago by mvadkert. Opened 5 years ago by psss.

build into master

Use a single schema for koji builds & brew builds

Petr Šplíchal • 5 years ago

73916b4

schemas/brew-build.test.complete.yaml

file modified

+1 -1

		`@@ -11,7 +11,7 @@`
		`run:`
		`$ref: run.json`
		`artifact:`
		`- $ref: brew-build.json`
		`+ $ref: rpm-build.json`
		`system:`
		`type: array`
		`items:`

schemas/brew-build.test.error.yaml

file modified

+1 -1

		`@@ -13,7 +13,7 @@`
		`run:`
		`$ref: run.json`
		`artifact:`
		`- $ref: brew-build.json`
		`+ $ref: rpm-build.json`
		`category:`
		`$ref: common.json#properties/category`
		`type:`

schemas/brew-build.test.queued.yaml

file modified

+1 -1

		`@@ -11,7 +11,7 @@`
		`run:`
		`$ref: run.json`
		`artifact:`
		`- $ref: brew-build.json`
		`+ $ref: rpm-build.json`
		`category:`
		`$ref: common.json#properties/category`
		`type:`

schemas/brew-build.test.running.yaml

file modified

+1 -1

		`@@ -11,7 +11,7 @@`
		`run:`
		`$ref: run.json`
		`artifact:`
		`- $ref: brew-build.json`
		`+ $ref: rpm-build.json`
		`category:`
		`$ref: common.json#properties/category`
		`type:`

schemas/koji-build.test.complete.yaml

file modified

+1 -1

		`@@ -11,7 +11,7 @@`
		`run:`
		`$ref: run.json`
		`artifact:`
		`- $ref: koji-build.json`
		`+ $ref: rpm-build.json`
		`system:`
		`type: array`
		`items:`

schemas/koji-build.test.error.yaml

file modified

+1 -1

		`@@ -13,7 +13,7 @@`
		`run:`
		`$ref: run.json`
		`artifact:`
		`- $ref: koji-build.json`
		`+ $ref: rpm-build.json`
		`category:`
		`$ref: common.json#properties/category`
		`type:`

schemas/koji-build.test.queued.yaml

file modified

+1 -1

		`@@ -11,7 +11,7 @@`
		`run:`
		`$ref: run.json`
		`artifact:`
		`- $ref: koji-build.json`
		`+ $ref: rpm-build.json`
		`category:`
		`$ref: common.json#properties/category`
		`type:`

schemas/koji-build.test.running.yaml

file modified

+1 -1

		`@@ -11,7 +11,7 @@`
		`run:`
		`$ref: run.json`
		`artifact:`
		`- $ref: koji-build.json`
		`+ $ref: rpm-build.json`
		`category:`
		`$ref: common.json#properties/category`
		`type:`

schemas/koji-build.yaml

file removed

-85

		`@@ -1,85 +0,0 @@`
		`- $id: https://pagure.io/fedora-ci/messages/koji-build`
		`- $schema: http://json-schema.org/draft-07/schema#`
		`-`
		`- description:`
		`- Details about the koji build being tested.`
		`-`
		`- properties:`
		`- type:`
		`- description:`
		`- Artifact type, in this case 'koji-build'.`
		`- enum:`
		`- - koji-build`
		`- type: string`
		`- id:`
		`- description:`
		`- Task ID of the koji build.`
		`- examples:`
		`- - 14546276`
		`- type: integer`
		`- component:`
		`- description:`
		`- Name of the component tested.`
		`- examples:`
		`- - bash`
		`- - python`
		`- - firefox`
		`- type: string`
		`- issuer:`
		`- description:`
		`- Build issuer of the artifact.`
		`- examples:`
		`- - ovasik`
		`- type: string`
		`- scratch:`
		`- description:`
		`- Indication if the build is a scratch build.`
		`- examples:`
		`- - true`
		`- - false`
		`- type: boolean`
		`- nvr:`
		`- description:`
		`- Name-version-release of the artifact.`
		`- examples:`
		`- - setup-2.8.71-7.el7_4`
		`- type: string`
		`- baseline:`
		`- description:`
		`- Name-version-release of baseline koji build (for comparison).`
		`- examples:`
		`- - setup-2.8.71-6.el7_4`
		`- type: string`
		`- dependencies:`
		`- items:`
		`- description:`
		`- NVR’s of additional dependencies that were needed to install`
		`- the brew/koji rpm build artifact. Note that usually to install`
		`- a package, you might need to include packages, not yet in`
		`- production repositories.`
		`- examples:`
		`- - gcc-3.8.2-1.el7`
		`- - make-2.3.1-2.el7_4`
		`- type: string`
		`- type: array`
		`- source:`
		`- description:`
		`- The first item in the request field from task details. This is`
		`- usually a link to git repository with a reference, delimited with`
		`- the '#' sign. In case of a scratch build or other build built via`
		`- uploading a src.rpm the build task source will look like the bash`
		`- scratch build.`
		`- examples:`
		`- - git+https://src.fedoraproject.org/rpms/setup.git?#5e0ae23a`
		`- - cli-build/1498396792.492652.jYJCrkUF/bash-4.4.12-5.fc26.src.rpm`
		`- type: string`
		`-`
		`- required:`
		`- - type`
		`- - id`
		`- - issuer`
		`- - component`
		`- - nvr`
		`- - scratch`
		`-`
		`- type: object`

schemas/rpm-build.yaml ~~schemas/brew-build.yaml~~

file renamed

+7 -6

		`@@ -1,19 +1,20 @@`
		`- $id: https://pagure.io/fedora-ci/messages/brew-build`
		`+ $id: https://pagure.io/fedora-ci/messages/rpm-build`
		`$schema: http://json-schema.org/draft-07/schema#`

		`description:`
		`- Details about the brew build being tested.`
		`+ Details about the koji/brew build being tested.`

		`properties:`
		`type:`
		`description:`
		`- Artifact type, in this case 'brew-build'.`
		`+ Artifact type, in this case 'koji-build' or 'brew-build'.`
		`enum:`
		`+ - koji-build`
		`- brew-build`
		`type: string`
		`id:`
		`description:`
		`- Task ID of the brew build.`
		`+ Task ID of the koji/brew build.`
		`examples:`
		`- 14546276`
		`type: integer`
		`@@ -46,7 +47,7 @@`
		`type: string`
		`baseline:`
		`description:`
		`- Name-version-release of baseline brew build (for comparison).`
		`+ Name-version-release of baseline koji/brew build (for comparison).`
		`examples:`
		`- setup-2.8.71-6.el7_4`
		`type: string`
		`@@ -54,7 +55,7 @@`
		`items:`
		`description:`
		`NVR’s of additional dependencies that were needed to install`
		`- the brew/koji rpm build artifact. Note that usually to install`
		`+ the koji/brew rpm build artifact. Note that usually to install`
		`a package, you might need to include packages, not yet in`
		`production repositories.`
		`examples:`

psss commented 5 years ago

Let's share the schema for koji builds and brew builds as they are
(and should be) basically identical. This removes some duplication
as well as ensures we keep rpm build artifacts consistent between
upstream and downstream.

rebased onto 73916b4

5 years ago