From 7f4cac90784dea6ded4537114bdfbc426d6df2fa Mon Sep 17 00:00:00 2001 From: Robert Cerven Date: Thu, 28 Mar 2024 15:55:47 +0100 Subject: [PATCH] Add 'module' for rpm info in workflow data schema * STONEBLD-258 Signed-off-by: Robert Cerven --- atomic_reactor/schemas/workflow_data.json | 5 +++-- tests/test_schemas.py | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/atomic_reactor/schemas/workflow_data.json b/atomic_reactor/schemas/workflow_data.json index 65b0d8969..af33cfc8f 100644 --- a/atomic_reactor/schemas/workflow_data.json +++ b/atomic_reactor/schemas/workflow_data.json @@ -90,9 +90,10 @@ "arch": {"type": "string"}, "sigmd5": {"type": "string"}, "signature": {"type": ["string", "null"]}, - "epoch": {"type": ["integer", "null"], "minimum": 0} + "epoch": {"type": ["integer", "null"], "minimum": 0}, + "module": {"type": ["string", "null"]} }, - "required": ["type", "name", "version", "release", "arch", "sigmd5", "signature", "epoch"], + "required": ["type", "name", "version", "release", "arch", "sigmd5", "signature", "epoch", "module"], "additionalProperties": false }, "dockerfile_images": { diff --git a/tests/test_schemas.py b/tests/test_schemas.py index 707f1ae0f..3c1e4a43b 100644 --- a/tests/test_schemas.py +++ b/tests/test_schemas.py @@ -173,28 +173,28 @@ def get_workflow_data_json(): 'version': '1.3.1', 'release': '1.fc24', 'arch': 'noarch', 'sigmd5': '7c1f60d8cde73e97a45e0c489f4a3b26', - 'signature': None, 'epoch': None}, + 'signature': None, 'epoch': None, 'module': None}, {'type': 'rpm', 'name': 'fedora-repos-rawhide', 'version': '24', 'release': '0.1', 'arch': 'noarch', 'sigmd5': 'd41df1e059544d906363605d47477e60', - 'signature': None, 'epoch': None}, + 'signature': None, 'epoch': None, 'module': None}, {'type': 'rpm', 'name': 'gpg-pubkey-doc', 'version': '1.0', 'release': '1', 'arch': 'noarch', 'sigmd5': '00000000000000000000000000000000', - 'signature': None, 'epoch': None}], + 'signature': None, 'epoch': None, 'module': None}], 'ppc64le': [{'type': 'rpm', 'name': 'python-docker-py', 'version': '1.3.1', 'release': '1.fc24', 'arch': 'noarch', 'sigmd5': '7c1f60d8cde73e97a45e0c489f4a3b26', - 'signature': None, 'epoch': None}, + 'signature': None, 'epoch': None, 'module': None}, {'type': 'rpm', 'name': 'fedora-repos-rawhide', 'version': '24', 'release': '0.1', 'arch': 'noarch', 'sigmd5': 'd41df1e059544d906363605d47477e60', - 'signature': None, 'epoch': None}, + 'signature': None, 'epoch': None, 'module': None}, {'type': 'rpm', 'name': 'gpg-pubkey-doc', 'version': '1.0', 'release': '1', 'arch': 'noarch', 'sigmd5': '00000000000000000000000000000000', - 'signature': None, 'epoch': None}], + 'signature': None, 'epoch': None, 'module': None}], } with TemporaryDirectory() as d: