modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-07-17 03:20:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added search for modules by binary rpm.

Browse Source 
Signed-off-by: Martin Curlej <mcurlej@redhat.com>

Updated PR according to review.

Signed-off-by: Martin Curlej <mcurlej@redhat.com>

Searching by multiple koji tags + tests

Signed-off-by: Martin Curlej <mcurlej@redhat.com>
This commit is contained in:
Martin Curlej
2018-06-19 17:01:16 +02:00
parent 6981449853
commit 0aa9f014ce
3 changed files with 85 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
module_build_service/utils/views.py
View File

@@ -30,7 +30,7 @@ from datetime import datetime
from flask import request, url_for, Response
from sqlalchemy.sql.sqltypes import Boolean as sqlalchemy_boolean
from module_build_service import models, api_version
from module_build_service import models, api_version, conf
from module_build_service.errors import ValidationError, NotFound
from .general import scm_url_schemes
@@ -212,12 +212,25 @@ def filter_module_builds(flask_request):
for key, part in zip(query_keys, nsvc_parts):
search_query[key] = part
rpm = flask_request.args.get('rpm', None)
koji_tags = []
if rpm:
if conf.system == "koji":
# we are importing the koji builder here so we can search for the rpm metadata
# from koji. If we imported this regulary we would have gotten a circular import error.
from module_build_service.builder.KojiModuleBuilder import KojiModuleBuilder # noqa
koji_tags = KojiModuleBuilder.get_rpm_module_tag(rpm)
else:
raise ValidationError("Configured builder does not allow to search by rpm binary name!")
query = models.ModuleBuild.query
if search_query:
query = query.filter_by(**search_query)
if search_states:
query = query.filter(models.ModuleBuild.state.in_(search_states))
if koji_tags:
query = query.filter(models.ModuleBuild.koji_tag.in_(koji_tags)).filter_by(**search_query)
# This is used when filtering the date request parameters, but it is here to avoid recompiling
utc_iso_datetime_regex = re.compile(