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

Merge #645 Always regen repository when starting module build to not wait on kojira.

Browse Source
This commit is contained in:
Jan Kaluža
2017-08-24 12:04:42 +00:00
parent 8ca03a859f dfdd924bbf
commit 6627e6ee5e
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
module_build_service/scheduler/handlers/modules.py
View File

@@ -292,16 +292,13 @@ def wait(config, session, msg):
session.add(build)
session.commit()
# If this build already exists and is done, then regenerate the repository
# to ensure module-build-macros is there.
if state == koji.BUILD_STATES['COMPLETE']:
if config.system == "koji":
log.info("module-build-macros is already built. "
"Regenerating the repo.")
task_id = builder.koji_session.newRepo(
builder.module_build_tag['name'])
build.new_repo_task_id = task_id
session.commit()
else:
return [module_build_service.messaging.KojiRepoChange(
'fake msg', builder.module_build_tag['name'])]
# We always have to regenerate the repository.
if config.system == "koji":
log.info("Regenerating the repository")
task_id = builder.koji_session.newRepo(
builder.module_build_tag['name'])
build.new_repo_task_id = task_id
session.commit()
else:
return [module_build_service.messaging.KojiRepoChange(
'fake msg', builder.module_build_tag['name'])]

4
tests/test_scheduler/test_module_wait.py
View File

@@ -133,7 +133,7 @@ class TestModuleWait(unittest.TestCase):
def test_new_repo_not_called_when_macros_not_reused(
self, pdc, create_builder, koji_get_session, dbg):
"""
Test that newRepo is not called when module-build-macros build is not reused.
Test that newRepo is called everytime for module-build-macros
"""
with app.app_context():
pdc.get_module_tag.return_value = "module-testmodule-master-20170109091357"
@@ -153,4 +153,4 @@ class TestModuleWait(unittest.TestCase):
module_build_state='some state')
module_build_service.scheduler.handlers.modules.wait(
config=conf, session=db.session, msg=msg)
self.assertTrue(not koji_session.newRepo.called)
self.assertTrue(koji_session.newRepo.called)