Skip to content

Commit

Permalink
Make compose with name:stream:version:context
Browse files Browse the repository at this point in the history
When using name:stream:version to create compose,
all contexts with the same name:stream:version will
be returned in the result from MBS which is unexpected.

JIRA: RHELWF-7942
  • Loading branch information
chuazhan committed Jan 4, 2023
1 parent e5874b4 commit 68df8d0
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
Expand Up @@ -255,14 +255,14 @@ def _updated_compose_source(
self,
original_odcs_compose_ids,
module_name_stream_set,
module_name_stream_version_set,
module_nsvc_set,
):
"""
Generate updated compose source.
:param original_odcs_compose_ids list: Original compose ids.
:param module_name_stream_set set: Module name stream set from an advisory.
:param module_name_stream_version_set set: Module name stream version set from an advisory.
:param module_nsvc_set set: Module name stream version context set from an advisory.
:return: a string of updated compose source.
:rtype: set
"""
Expand All @@ -275,7 +275,7 @@ def _updated_compose_source(
f"{n}:{s}" for n, s, v, c in _compose_sources(compose)
}
mapping = {
f"{n}:{s}": f"{n}:{s}:{v}"
f"{n}:{s}": f"{n}:{s}:{v}:{c}"
for n, s, v, c in _compose_sources(compose)
}

Expand All @@ -286,7 +286,7 @@ def _updated_compose_source(
module_name_stream_set
)
)
updated_composes.update(module_name_stream_version_set)
updated_composes.update(module_nsvc_set)

return " ".join(sorted(updated_composes))

Expand Down Expand Up @@ -333,16 +333,17 @@ def _record_builds(self, images, image_modules_mapping):
# in case of error.
self.set_context(build)

module_name_stream_version_set = set()
module_nsvc_set = set()
module_name_stream_set = set()
module_nvrs = image_modules_mapping[nvr]
for module_nvr in module_nvrs:
mmd = session.get_modulemd(module_nvr)
name = mmd.get_module_name()
stream = mmd.get_stream_name()
version = mmd.get_version()
context = mmd.get_context()
module_name_stream_set.add(f"{name}:{stream}")
module_name_stream_version_set.add(f"{name}:{stream}:{version}")
module_nsvc_set.add(f"{name}:{stream}:{version}:{context}")
original_odcs_compose_ids = image["odcs_compose_ids"]
reused_composes = self._reused_composes(
original_odcs_compose_ids, module_name_stream_set
Expand All @@ -366,7 +367,7 @@ def _record_builds(self, images, image_modules_mapping):
compose_source = self._updated_compose_source(
original_odcs_compose_ids,
module_name_stream_set,
module_name_stream_version_set,
module_nsvc_set,
)
arches = sorted(image["arches"].split())
if compose_source:
Expand Down
Expand Up @@ -299,19 +299,19 @@ def test_prepare_data_for_compose_some_sources_in_adv(self, create_odcs_client):
}
original_odcs_compose_ids = ["985716"]
module_name_stream_set = set(["name:stream"])
module_name_stream_version_set = set(["name:stream:9823933"])
module_nsvc_set = set(["name:stream:9823933:8233ee4"])
reused_composes = self.handler._reused_composes(
original_odcs_compose_ids, module_name_stream_set
)
updated_compose_source = self.handler._updated_compose_source(
original_odcs_compose_ids,
module_name_stream_set,
module_name_stream_version_set,
module_nsvc_set,
)
self.assertEqual(reused_composes, set())
self.assertEqual(
updated_compose_source,
"name:stream:9823933 nodejs:14:8040020211213111158",
"name:stream:9823933:8233ee4 nodejs:14:8040020211213111158:522a0ee4",
)

@patch("freshmaker.odcsclient.create_odcs_client")
Expand Down

0 comments on commit 68df8d0

Please sign in to comment.