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

Don't try to untag stale module builds that don't have any completed components

Browse Source
This commit is contained in:
mprahl
2017-11-20 10:38:56 -05:00
parent 425c2344fe
commit 02e11b9b39
2 changed files with 52 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
module_build_service/scheduler/producer.py
View File

@@ -158,15 +158,17 @@ class MBSProducer(PollingProducer):
# Find completed artifacts in the stale build
artifacts = [c for c in module.component_builds
if c.state == koji.BUILD_STATES['COMPLETE']]
# Set proxy_user=False to not authenticate as the module owner for these tasks
builder = GenericBuilder.create_from_module(
session, module, conf, proxy_user=False)
builder.untag_artifacts([c.nvr for c in artifacts])
# Mark the artifacts as untagged in the database
for c in artifacts:
c.tagged = False
c.tagged_in_final = False
session.add(c)
# If there are no completed artifacts, then there is nothing to tag
if artifacts:
# Set proxy_user=False to not authenticate as the module owner for these tasks
builder = GenericBuilder.create_from_module(
session, module, conf, proxy_user=False)
builder.untag_artifacts([c.nvr for c in artifacts])
# Mark the artifacts as untagged in the database
for c in artifacts:
c.tagged = False
c.tagged_in_final = False
session.add(c)
state_reason = ('The module was garbage collected since it has failed over {0}'
' day(s) ago'.format(conf.cleanup_failed_builds_time))
module.transition(

41
tests/test_scheduler/test_poller.py
View File

@@ -376,3 +376,44 @@ class TestPoller(unittest.TestCase):
self.assertFalse(component.tagged_in_final)
# Make sure module_build_one stayed the same
self.assertEqual(module_build_one.state, models.BUILD_STATES['failed'])
def test_cleanup_stale_failed_builds_no_components(self, create_builder, koji_get_session,
global_consumer, dbg):
""" Test that a module build without any components built gets to the garbage state when
running cleanup_stale_failed_builds.
"""
module_build_one = models.ModuleBuild.query.get(1)
module_build_two = models.ModuleBuild.query.get(2)
module_build_one.state = models.BUILD_STATES['failed']
module_build_one.time_modified = datetime.utcnow()
module_build_two.state = models.BUILD_STATES['failed']
module_build_two.time_modified = datetime.utcnow() - timedelta(
days=conf.cleanup_failed_builds_time + 1)
module_build_two.koji_tag = None
module_build_two.cg_build_koji_tag = None
for c in module_build_two.component_builds:
c.state = None
db.session.add(c)
db.session.add(module_build_one)
db.session.add(module_build_two)
db.session.commit()
consumer = mock.MagicMock()
consumer.incoming = queue.Queue()
global_consumer.return_value = consumer
hub = mock.MagicMock()
poller = MBSProducer(hub)
# Ensure the queue is empty before we start
self.assertEquals(consumer.incoming.qsize(), 0)
poller.cleanup_stale_failed_builds(conf, db.session)
db.session.refresh(module_build_two)
# Make sure module_build_two was transitioned to garbage
self.assertEqual(module_build_two.state, models.BUILD_STATES['garbage'])
state_reason = ('The module was garbage collected since it has failed over {0} day(s) ago'
.format(conf.cleanup_failed_builds_time))
self.assertEqual(module_build_two.state_reason, state_reason)
# Make sure module_build_one stayed the same
self.assertEqual(module_build_one.state, models.BUILD_STATES['failed'])
# Make sure that the builder was never instantiated
create_builder.assert_not_called()