| |
@@ -43,7 +43,7 @@
|
| |
import munch
|
| |
from OpenSSL.SSL import SysCallError
|
| |
|
| |
- from module_build_service import log, conf
|
| |
+ from module_build_service import log, conf, models
|
| |
import module_build_service.scm
|
| |
import module_build_service.utils
|
| |
from module_build_service.builder.utils import execute_cmd
|
| |
@@ -51,6 +51,7 @@
|
| |
|
| |
from module_build_service.builder.base import GenericBuilder
|
| |
from module_build_service.builder.KojiContentGenerator import KojiContentGenerator
|
| |
+ from module_build_service.utils import get_reusable_components, get_reusable_module
|
| |
|
| |
logging.basicConfig(level=logging.DEBUG)
|
| |
|
| |
@@ -222,6 +223,68 @@
|
| |
return ready
|
| |
|
| |
@staticmethod
|
| |
+ def _get_filtered_rpms_on_self_dep(module_build, filtered_rpms_of_dep):
|
| |
+ # filtered_rpms will contain the NVRs of non-reusable component's RPMs
|
| |
+ filtered_rpms = list(set(filtered_rpms_of_dep))
|
| |
+ with models.make_session(conf) as db_session:
|
| |
+ # Get a module build that can be reused, which will likely be the
|
| |
+ # build dep that is used since it relies on itself
|
| |
+ reusable_module = get_reusable_module(db_session, module_build)
|
| |
+ if not reusable_module:
|
| |
+ return filtered_rpms
|
| |
+ koji_session = KojiModuleBuilder.get_session(conf, None)
|
| |
+ # Get all the RPMs and builds of the reusable module in Koji
|
| |
+ rpms, builds = koji_session.listTaggedRPMS(reusable_module.koji_tag, latest=True)
|
| |
+ # Convert the list to a dict where each key is the build_id
|
| |
+ builds = {build['build_id']: build for build in builds}
|
| |
+ # Create a mapping of package (SRPM) to the RPMs in NVR format
|
| |
+ package_to_rpms = {}
|
| |
+ for rpm in rpms:
|
| |
+ package = builds[rpm['build_id']]['name']
|
| |
+ if package not in package_to_rpms:
|
| |
+ package_to_rpms[package] = []
|
| |
+ package_to_rpms[package].append(kobo.rpmlib.make_nvr(rpm))
|
| |
+
|
| |
+ components_in_module = [c.package for c in module_build.component_builds]
|
| |
+ reusable_components = get_reusable_components(
|
| |
+ db_session, module_build, components_in_module,
|
| |
+ previous_module_build=reusable_module)
|
| |
+ # Loop through all the reusable components to find if any of their RPMs are
|
| |
+ # being filtered
|
| |
+ for reusable_component in reusable_components:
|
| |
+ # reusable_component will be None if the component can't be reused
|
| |
+ if not reusable_component:
|
| |
+ continue
|
| |
+ # We must get the component name from the NVR and not from
|
| |
+ # reusable_component.package because macros such as those used
|
| |
+ # by SCLs can change the name of the underlying build
|
| |
+ component_name = kobo.rpmlib.parse_nvr(reusable_component.nvr)['name']
|
| |
+
|
| |
+ if component_name not in package_to_rpms:
|
| |
+ continue
|
| |
+
|
| |
+ # Loop through the RPMs associted with the reusable component
|
| |
+ for nvr in package_to_rpms[component_name]:
|
| |
+ parsed_nvr = kobo.rpmlib.parse_nvr(nvr)
|
| |
+ # Don't compare with the epoch
|
| |
+ parsed_nvr['epoch'] = None
|
| |
+ # Loop through all the filtered RPMs to find a match with the reusable
|
| |
+ # component's RPMs.
|
| |
+ for nvr2 in list(filtered_rpms):
|
| |
+ parsed_nvr2 = kobo.rpmlib.parse_nvr(nvr2)
|
| |
+ # Don't compare with the epoch
|
| |
+ parsed_nvr2['epoch'] = None
|
| |
+ # Only remove the filter if we are going to reuse a component with
|
| |
+ # the same exact NVR
|
| |
+ if parsed_nvr == parsed_nvr2:
|
| |
+ filtered_rpms.remove(nvr2)
|
| |
+ # Since filtered_rpms was cast to a set and then back
|
| |
+ # to a list above, we know there won't be duplicate RPMS,
|
| |
+ # so we can just break here.
|
| |
+ break
|
| |
+ return filtered_rpms
|
| |
+
|
| |
+ @staticmethod
|
| |
def get_disttag_srpm(disttag, module_build):
|
| |
|
| |
# Taken from Karsten's create-distmacro-pkg.sh
|
| |
@@ -243,7 +306,13 @@
|
| |
if req_data["filtered_rpms"]:
|
| |
filter_conflicts += "# Filtered rpms from %s module:\n" % (
|
| |
req_name)
|
| |
- for nvr in req_data["filtered_rpms"]:
|
| |
+ # Check if the module depends on itself
|
| |
+ if req_name == module_build.name:
|
| |
+ filtered_rpms = KojiModuleBuilder._get_filtered_rpms_on_self_dep(
|
| |
+ module_build, req_data["filtered_rpms"])
|
| |
+ else:
|
| |
+ filtered_rpms = req_data["filtered_rpms"]
|
| |
+ for nvr in filtered_rpms:
|
| |
parsed_nvr = kobo.rpmlib.parse_nvr(nvr)
|
| |
filter_conflicts += "Conflicts: %s = %s:%s-%s\n" % (
|
| |
parsed_nvr["name"], parsed_nvr["epoch"],
|
| |
mprahl
commented 5 years ago
If a module has filters set and it buildrequires itself, issues occur during component reuse. In that event, the filtered RPMs from the previous module build will not be available in the buildroot because the NVRs in the filters will match the RPMs from the reused component.