mirror of
https://pagure.io/fm-orchestrator.git
synced 2026-04-04 03:08:21 +08:00
Drop get_module_repo function since it is in GenericBuilder
This commit is contained in:
committed by
Ralph Bean
parent
34a2ea7856
commit
8c65718daa
@@ -34,7 +34,7 @@ from module_build_service.config import Config
|
||||
from module_build_service import models
|
||||
from module_build_service.pdc import (
|
||||
get_pdc_client_session, get_module, get_module_runtime_dependencies,
|
||||
get_module_tag, get_module_build_dependencies, get_module_repo)
|
||||
get_module_tag, get_module_build_dependencies)
|
||||
import module_build_service.auth
|
||||
import module_build_service.scheduler.main
|
||||
from module_build_service.utils import submit_module_build
|
||||
@@ -91,10 +91,6 @@ def testpdc():
|
||||
print ("build_deps=%s" % get_module_build_dependencies(
|
||||
pdc_session, module))
|
||||
print ("tag=%s" % get_module_tag(pdc_session, module))
|
||||
|
||||
module2 = get_module(pdc_session, {"name": "coprtestmodule", "version": "4.3.43", "release": 1})
|
||||
print ("pdc_data=%s" % str(module))
|
||||
print ("repo=%s" % get_module_repo(pdc_session, module2))
|
||||
else:
|
||||
print ('module was not found')
|
||||
|
||||
|
||||
@@ -157,38 +157,6 @@ def get_module_tag(session, module_info, strict=False):
|
||||
"""
|
||||
return get_module(session, module_info, strict=strict)['koji_tag']
|
||||
|
||||
def get_module_repo(session, module_info, strict=False, config=module_build_service.conf):
|
||||
"""
|
||||
:param session : PDCClient instance
|
||||
:param module_info: list of module_info dicts
|
||||
:param strict: Normally this function returns None if no module can be
|
||||
found. If strict=True, then a ValueError is raised.
|
||||
:param config: instance of module_build_service.config.Config
|
||||
:return: URL to a DNF repository for the module
|
||||
"""
|
||||
module = get_module(session, module_info, strict=strict)
|
||||
if not module:
|
||||
return None
|
||||
|
||||
# Module was built in Koji
|
||||
# @TODO There should be implemented retrieveing URL to a module repofile in koji
|
||||
if module["koji_tag"] != "-":
|
||||
raise NotImplementedError
|
||||
|
||||
# TODO We should revisit the decision to include CoprClient code in the
|
||||
# pdc.py module.
|
||||
from copr.client import CoprClient
|
||||
|
||||
# Module was built in Copr
|
||||
# @TODO get the correct user
|
||||
owner, nvr = "@copr", module["variant_id"]
|
||||
cl = CoprClient.create_from_file_config(config.copr_config)
|
||||
response = cl.get_module_repo(owner, nvr).data
|
||||
|
||||
if response["output"] == "notok":
|
||||
raise ValueError(response["error"])
|
||||
return response["repo"]
|
||||
|
||||
def module_depsolving_wrapper(session, module_list, strict=True):
|
||||
"""
|
||||
:param session : PDCClient instance
|
||||
|
||||
Reference in New Issue
Block a user