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

Make sync_koji_build_tags poller working only with the builds that are in build state for some time

Browse Source 
This fixes #1271

Signed-off-by: Valerij Maljulin <vmaljuli@redhat.com>
This commit is contained in:
Valerij Maljulin
2019-05-30 17:58:51 +02:00
parent 13afde0124
commit 52a600be40
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module_build_service/scheduler/producer.py
View File

@@ -427,7 +427,11 @@ class MBSProducer(PollingProducer):
koji_session = KojiModuleBuilder.get_session(conf, login=False)
module_builds = models.ModuleBuild.by_state(session, "build")
threshold = datetime.utcnow() - timedelta(minutes=10)
module_builds = session.query(models.ModuleBuild).filter(
models.ModuleBuild.time_modified < threshold,
models.ModuleBuild.state == models.BUILD_STATES["build"]
).all()
for module_build in module_builds:
complete_components = module_build.current_batch(koji.BUILD_STATES["COMPLETE"])
for c in complete_components:

23
tests/test_scheduler/test_poller.py
View File

@@ -575,15 +575,18 @@ class TestPoller:
@pytest.mark.parametrize("tagged", (True, False))
@pytest.mark.parametrize("tagged_in_final", (True, False))
@pytest.mark.parametrize("btime", (True, False))
@patch("module_build_service.builder.KojiModuleBuilder.KojiClientSession")
def test_sync_koji_build_tags(
self, ClientSession, create_builder, global_consumer, dbg, tagged, tagged_in_final
self, ClientSession, create_builder, global_consumer, dbg, tagged, tagged_in_final, btime
):
module_build_2 = models.ModuleBuild.query.filter_by(id=2).one()
# Only module build 1's build target should be deleted.
module_build_2.koji_tag = "module-tag1"
module_build_2.state = models.BUILD_STATES["build"]
if btime:
module_build_2.time_modified = datetime.utcnow() - timedelta(minutes=12)
c = module_build_2.current_batch()[0]
c.state = koji.BUILD_STATES["COMPLETE"]
c.tagged_in_final = False
@@ -595,10 +598,11 @@ class TestPoller:
# No created module build has any of these tags.
ret = []
if tagged:
ret.append({"id": 1, "name": module_build_2.koji_tag + "-build"})
if tagged_in_final:
ret.append({"id": 2, "name": module_build_2.koji_tag})
if btime:
if tagged:
ret.append({"id": 1, "name": module_build_2.koji_tag + "-build"})
if tagged_in_final:
ret.append({"id": 2, "name": module_build_2.koji_tag})
koji_session.listTags.return_value = ret
consumer = mock.MagicMock()
@@ -612,10 +616,11 @@ class TestPoller:
assert consumer.incoming.qsize() == len(ret)
expected_msg_tags = []
if tagged:
expected_msg_tags.append(module_build_2.koji_tag + "-build")
if tagged_in_final:
expected_msg_tags.append(module_build_2.koji_tag)
if btime:
if tagged:
expected_msg_tags.append(module_build_2.koji_tag + "-build")
if tagged_in_final:
expected_msg_tags.append(module_build_2.koji_tag)
assert len(expected_msg_tags) == consumer.incoming.qsize()