PR#1729: don't filter runtime deps for packagerV3 case

Merges #1729
https://pagure.io/fm-orchestrator/pull-request/1729
This commit is contained in:
Mike McLean
2021-08-30 11:59:16 -04:00
2 changed files with 2 additions and 16 deletions

View File

@@ -789,20 +789,6 @@ def process_module_context_configuration(stream_or_packager):
if not stream.is_static_context():
stream.set_static_context()
# we get the dependenices of the stream
deps = stream.get_dependencies()
# with v3 packager format the output v2 stream will always have
# only one set of dependecies. We need to remove the platform
# virtual module from runtime dependencies as it is not desired.
modules = deps[0].get_runtime_modules()
module_streams = [(m, deps[0].get_runtime_streams(m)[0]) for m in modules
if m not in conf.base_module_names]
deps[0].clear_runtime_dependencies()
for module_stream in module_streams:
module, stream = module_stream
deps[0].add_runtime_stream(module, stream)
return streams, static_context
else:
xmd = stream_or_packager.get_xmd()

View File

@@ -120,9 +120,9 @@ class TestSubmit:
assert len(builds) == 2
expected_deps = {"CTX1": {"buildrequires": {"platform": ["f28"]},
"requires": {"nginx": ["1"]}},
"requires": {"nginx": ["1"], "platform": ["f28"]}},
"CTX2": {"buildrequires": {"platform": ["f29.2.0"]},
"requires": {}}}
"requires": {"platform": ["f29"]}}}
for build in builds:
mmd = build.mmd()