modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-05-05 05:21:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #347 Possibility to specify optional parameters when submitting build

Browse Source
This commit is contained in:
Matt Prahl
2017-02-28 14:26:20 +00:00
parent be3b05e673 70103c41e2
commit 7dfb647e08
6 changed files with 88 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
module_build_service/utils.py
View File

@@ -543,17 +543,17 @@ def record_component_builds(scm, mmd, module, initial_batch = 1):
return batch
def submit_module_build_from_yaml(username, yaml):
def submit_module_build_from_yaml(username, yaml, optional_params=None):
mmd = load_mmd(yaml)
return submit_module_build(username, None, mmd, None, yaml)
return submit_module_build(username, None, mmd, None, yaml, optional_params)
def submit_module_build_from_scm(username, url, allow_local_url=False):
def submit_module_build_from_scm(username, url, allow_local_url=False, optional_params=None):
mmd, scm, yaml = _fetch_mmd(url, allow_local_url)
return submit_module_build(username, url, mmd, scm, yaml)
return submit_module_build(username, url, mmd, scm, yaml, optional_params)
def submit_module_build(username, url, mmd, scm, yaml):
def submit_module_build(username, url, mmd, scm, yaml, optional_params=None):
# Import it here, because SCM uses utils methods
# and fails to import them because of dep-chain.
import module_build_service.scm
@@ -586,7 +586,8 @@ def submit_module_build(username, url, mmd, scm, yaml):
version=str(mmd.version),
modulemd=yaml,
scmurl=url,
username=username
username=username,
**(optional_params or {})
)
record_component_builds(scm, mmd, module)
@@ -599,6 +600,18 @@ def submit_module_build(username, url, mmd, scm, yaml):
mmd.name, mmd.stream, mmd.version)
return module
def validate_optional_params(params):
forbidden_params = [k for k in params if k not in models.ModuleBuild.__table__.columns]
if forbidden_params:
raise ValidationError('The request contains unspecified parameters: {}'.format(", ".join(forbidden_params)))
forbidden_params = [k for k in params if k.startswith("copr_")]
if conf.system != "copr" and forbidden_params:
raise ValidationError('The request contains parameters specific to Copr builder: {} even though {} is used'
.format(", ".join(forbidden_params), conf.system))
def scm_url_schemes(terse=False):
"""
Definition of URL schemes supported by both frontend and scheduler.