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

Find compatible base modules based on the virtual streams.

Browse Source 
Before this commit, the compatible base modules for Module Stream Expansion
have been found without any limitation, just based on the stream version.
It was therefore possible that `platform:lp29.0.0` was found as compatible
module for `platform:f29.1.0` although those platform streams are not
compatible at all.

In this commit, the module can be treated as compatible only if it has
the same virtual stream as the input module. The idea behind this
is that both `platform:f29.0.0` and `platform:f29.1.0` should include
the `virtual_streams: [f29]` in their XMD section which tells MBS
that they are actually compatible. The `lp29` stream will not
have the same virtual stream (most likely it won't have any virtual
stream at all).

The `virtual_streams` is already used for this use-case in `MMDResolver`,
but it was not used to limit the inputs to `MMDResolver` which is what
this commit is doing.

This commit also fixes the issue in `get_last_builds_in_stream_version_lte`
which was simply broken if multiple stream_versions of single base module
existed and their builds had different version. In this case, only
builds with single (randomly chosen) version were returned.
This commit is contained in:
Jan Kaluza
2019-03-25 14:54:17 +01:00
parent f81c25d6dd
commit 780ed117b4
6 changed files with 142 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
module_build_service/utils/mse.py
View File

@@ -218,11 +218,52 @@ def _get_base_module_mmds(mmd):
if ns in seen:
continue
# Get the MMD for particular buildrequired name:stream to find out the virtual
# streams according to which we can find the compatible streams later.
# The returned MMDs are all the module builds for name:stream in the highest
# version. Given the base module does not depend on other modules, it can appear
# only in single context and therefore the `mmds` should always contain just
# zero or one module build.
mmds = resolver.get_module_modulemds(name, stream)
if not mmds:
continue
stream_mmd = mmds[0]
# In case there are no virtual_streams in the buildrequired name:stream,
# it is clear that there are no compatible streams, so return just this
# `stream_mmd`.
xmd = stream_mmd.get_xmd()
if "mbs" not in xmd.keys() or "virtual_streams" not in xmd["mbs"].keys():
seen.add(ns)
ret.append(stream_mmd)
continue
# Get the list of compatible virtual streams.
virtual_streams = xmd["mbs"]["virtual_streams"]
mmds = resolver.get_module_modulemds(name, stream, stream_version_lte=True)
ret_chunk = []
# Add the returned mmds to the `seen` set to avoid querying those individually if
# they are part of the buildrequire streams for this base module
for mmd_ in mmds:
mmd_ns = ":".join([mmd_.get_name(), mmd_.get_stream()])
xmd = mmd_.get_xmd()
if "mbs" not in xmd.keys() or "virtual_streams" not in xmd["mbs"].keys():
# This module does not contain any virtual stream, so it cannot
# be compatible with our buildrequired module.
continue
# Check if some virtual stream from buildrequired module exists in
# this module. That would mean the modules are compatible.
mmd_virtual_streams = xmd["mbs"]["virtual_streams"]
for virtual_stream in virtual_streams:
if virtual_stream in mmd_virtual_streams:
break
else:
# No stream from `virtual_streams` exist in `mmd_virtual_streams`, so this
# module is not compatible with our buildrequired module.
continue
mmd_ns = ":".join([mmd_.get_name(), mmd_.get_stream()])
# An extra precaution to ensure there are no duplicates in the event the sorting
# above wasn't flawless