almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

osbuild: update schema and config documentation

Browse Source 
The `koji-osbuild` Hub schema has been relaxed a bit in the latest
release (v11). Adjust the schema in Pungi to reflect changes in
`koji-osbuild`.

For more information on the changes in `koji-osbuild`, see:
https://github.com/osbuild/koji-osbuild/pull/108

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
(cherry picked from commit ef6d40dce4)
This commit is contained in:
Tomáš Hozza 2022-11-23 11:53:33 +01:00 committed by soksanichenko
parent 46216b4f17
commit abec28256d
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/configuration.rst
View File

@ -1641,13 +1641,13 @@ OSBuild Composer for building images
* ``tenant_id`` -- Azure tenant ID to upload the image to * ``tenant_id`` -- Azure tenant ID to upload the image to
* ``subscription_id`` -- Azure subscription ID to upload the image to * ``subscription_id`` -- Azure subscription ID to upload the image to
* ``resource_group`` -- Azure resource group to upload the image to * ``resource_group`` -- Azure resource group to upload the image to
* ``location`` -- Azure location to upload the image to * ``location`` -- Azure location of the resource group (optional)
* ``image_name`` -- Image name of the uploaded Azure image (optional) * ``image_name`` -- Image name of the uploaded Azure image (optional)
* **GCP upload options** -- upload to Google Cloud Platform. * **GCP upload options** -- upload to Google Cloud Platform.
* ``region`` -- GCP region to upload the image to * ``region`` -- GCP region to upload the image to
* ``bucket`` -- GCP bucket to upload the image to * ``bucket`` -- GCP bucket to upload the image to (optional)
* ``share_with_accounts`` -- list of GCP accounts to share the image * ``share_with_accounts`` -- list of GCP accounts to share the image
with with
* ``image_name`` -- Image name of the uploaded GCP image (optional) * ``image_name`` -- Image name of the uploaded GCP image (optional)

8
pungi/checks.py
View File

@ -1229,7 +1229,10 @@ def make_schema():
"ostree_ref": {"type": "string"}, "ostree_ref": {"type": "string"},
"ostree_parent": {"type": "string"}, "ostree_parent": {"type": "string"},
"upload_options": { "upload_options": {
"oneOf": [ # this should be really 'oneOf', but the minimal
# required properties in AWSEC2 and GCP options
# overlap.
"anyOf": [
# AWSEC2UploadOptions # AWSEC2UploadOptions
{ {
"type": "object", "type": "object",
@ -1268,7 +1271,6 @@ def make_schema():
"tenant_id", "tenant_id",
"subscription_id", "subscription_id",
"resource_group", "resource_group",
"location",
], ],
"properties": { "properties": {
"tenant_id": {"type": "string"}, "tenant_id": {"type": "string"},
@ -1284,7 +1286,7 @@ def make_schema():
{ {
"type": "object", "type": "object",
"additionalProperties": False, "additionalProperties": False,
"required": ["region", "bucket"], "required": ["region"],
"properties": { "properties": {
"region": {"type": "string"}, "region": {"type": "string"},
"bucket": {"type": "string"}, "bucket": {"type": "string"},