Merge #150 Ignore repository builds without the '-build' suffix.

This commit is contained in:
Ralph Bean
2016-10-31 13:03:58 +00:00
2 changed files with 8 additions and 4 deletions

View File

@@ -36,7 +36,11 @@ def done(config, session, msg):
""" Called whenever koji rebuilds a repo, any repo. """
# First, find our ModuleBuild associated with this repo, if any.
tag = msg.repo_tag.strip('-build')
tag = msg.repo_tag
if not tag.endswith('-build'):
log.info("Tag %r does not end with '-build' suffix, ignoring" % tag)
return
tag = tag.strip('-build')
module_build = models.ModuleBuild.from_repo_done_event(session, msg)
if not module_build:
log.info("No module build found associated with koji tag %r" % tag)

View File

@@ -46,7 +46,7 @@ class TestRepoDone(unittest.TestCase):
"""
from_repo_done_event.return_value = None
msg = module_build_service.messaging.KojiRepoChange(
'no matches for this...', '2016-some-guid')
'no matches for this...', '2016-some-guid-build')
self.fn(config=self.config, session=self.session, msg=msg)
@mock.patch('module_build_service.builder.KojiModuleBuilder.buildroot_ready')
@@ -76,7 +76,7 @@ class TestRepoDone(unittest.TestCase):
ready.return_value = True
msg = module_build_service.messaging.KojiRepoChange(
'no matches for this...', '2016-some-guid')
'no matches for this...', '2016-some-guid-build')
self.fn(config=self.config, session=self.session, msg=msg)
build_fn.assert_called_once_with(artifact_name='foo', source='full_scm_url')
@@ -109,7 +109,7 @@ class TestRepoDone(unittest.TestCase):
ready.return_value = True
msg = module_build_service.messaging.KojiRepoChange(
'no matches for this...', '2016-some-guid')
'no matches for this...', '2016-some-guid-build')
self.fn(config=self.config, session=self.session, msg=msg)
build_fn.assert_called_once_with(artifact_name='foo', source='full_scm_url')
module_build.transition.assert_called_once_with(self.config,