modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-05-11 18:37:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #1365 Allow components to be reused from module builds even if the buildrequires commit hashes changed for the changed-and-after rebuild strategy

Browse Source
This commit is contained in:
Jan Kaluža
2019-08-06 11:08:46 +00:00
parent b185b51721 a6bf9f88dd
commit 758cf9c112
9 changed files with 34 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module_build_service/utils/reuse.py
View File

@@ -117,9 +117,7 @@ def get_reusable_module(db_session, module):
previous_module_build = previous_module_build.filter(
models.ModuleBuild.rebuild_strategy.in_(["all", "changed-and-after"])
)
previous_module_build = previous_module_build.filter_by(
ref_build_context=module.ref_build_context
)
previous_module_build = previous_module_build.first()
if previous_module_build:

8
module_build_service/utils/submit.py
View File

@@ -1019,12 +1019,8 @@ def submit_module_build(db_session, username, mmd, params):
scratch=params.get("scratch"),
srpms=params.get("srpms"),
)
(
module.ref_build_context,
module.build_context,
module.runtime_context,
module.context,
) = module.contexts_from_mmd(module.modulemd)
module.build_context, module.runtime_context, module.context = \
module.contexts_from_mmd(module.modulemd)
module.context += context_suffix
all_modules_skipped = False