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

Merge #443 Do not try to tag builds which have been already tagged in a tag.

Browse Source
This commit is contained in:
Matt Prahl
2017-03-17 13:55:00 +00:00
parent 6aa50ebd24 10811e41dc
commit 3736a0dd6a
4 changed files with 78 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
module_build_service/builder.py
View File

@@ -523,6 +523,14 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules
log.info("%r adding deps on %r" % (self, dependencies))
self._koji_add_many_tag_inheritance(self.module_build_tag, dependencies)
def _get_tagged_nvrs(self, tag):
"""
Returns set of NVR strings tagged in tag `tag`.
"""
tagged = self.koji_session.listTagged(tag)
tagged_nvrs = set(build["nvr"] for build in tagged)
return tagged_nvrs
def buildroot_add_artifacts(self, artifacts, install=False):
"""
:param artifacts - list of artifacts to add to buildroot
@@ -533,7 +541,12 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules
log.info("%r adding artifacts %r" % (self, artifacts))
build_tag = self._get_tag(self.module_build_tag)['id']
tagged_nvrs = self._get_tagged_nvrs(self.module_build_tag['name'])
for nvr in artifacts:
if nvr in tagged_nvrs:
continue
log.info("%r tagging %r into %r" % (self, nvr, build_tag))
self.koji_session.tagBuild(build_tag, nvr)
@@ -548,7 +561,12 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules
def tag_artifacts(self, artifacts):
dest_tag = self._get_tag(self.module_tag)['id']
tagged_nvrs = self._get_tagged_nvrs(self.module_tag['name'])
for nvr in artifacts:
if nvr in tagged_nvrs:
continue
log.info("%r tagging %r into %r" % (self, nvr, dest_tag))
self.koji_session.tagBuild(dest_tag, nvr)

6
module_build_service/scheduler/handlers/components.py
View File

@@ -105,7 +105,11 @@ def _finalize(config, session, msg, state):
log.debug("%r" % built_components_in_batch)
install = bool(component_build.package == 'module-build-macros')
builder.buildroot_add_artifacts(built_components_in_batch, install=install)
builder.tag_artifacts(built_components_in_batch)
# Do not tag packages which belong to -build tag to final tag.
if not install:
builder.tag_artifacts(built_components_in_batch)
session.commit()
elif (any([c.state != koji.BUILD_STATES['BUILDING']
for c in unbuilt_components_in_batch])):

3
tests/test_build/test_build.py
View File

@@ -136,6 +136,7 @@ class TestModuleBuilder(GenericBuilder):
def buildroot_add_artifacts(self, artifacts, install=False):
if TestModuleBuilder.on_buildroot_add_artifacts_cb:
TestModuleBuilder.on_buildroot_add_artifacts_cb(self, artifacts, install)
self._send_repo_done()
def buildroot_add_repos(self, dependencies):
pass
@@ -143,7 +144,6 @@ class TestModuleBuilder(GenericBuilder):
def tag_artifacts(self, artifacts):
if TestModuleBuilder.on_tag_artifacts_cb:
TestModuleBuilder.on_tag_artifacts_cb(self, artifacts)
self._send_repo_done()
@property
def module_build_tag(self):
@@ -254,7 +254,6 @@ class TestBuild(unittest.TestCase):
# Check that components are tagged after the batch is built.
tag_groups = []
tag_groups.append([u'module-build-macros-0.1-1.module_fc4ed5f7.src.rpm-1-1'])
tag_groups.append([u'perl-Tangerine?#f25-1-1', u'perl-List-Compare?#f25-1-1'])
tag_groups.append([u'tangerine?#f25-1-1'])

83
tests/test_builder/test_koji.py
View File

@@ -31,12 +31,32 @@ import module_build_service.scheduler.handlers.repos
import module_build_service.models
import module_build_service.builder
from mock import patch
from mock import patch, MagicMock
from tests import conf
from module_build_service.builder import KojiModuleBuilder
class FakeKojiModuleBuilder(KojiModuleBuilder):
@module_build_service.utils.retry(wait_on=(xmlrpclib.ProtocolError, koji.GenericError))
def get_session(self, config, owner):
koji_config = munch.Munch(koji.read_config(
profile_name=config.koji_profile,
user_config=config.koji_config,
))
address = koji_config.server
koji_session = MagicMock()
koji_session.getRepo.return_value = {'create_event': 'fake event'}
def _get_tag(name):
_id = 2 if name.endswith("build") else 1
return {"name": name, "id": _id}
koji_session.getTag = _get_tag
return koji_session
class TestKojiBuilder(unittest.TestCase):
@@ -73,6 +93,39 @@ class TestKojiBuilder(unittest.TestCase):
fake_kmb.buildroot_ready()
self.assertEquals(mocked_kojiutil.checkForBuilds.call_count, 3)
def test_tagging_already_tagged_artifacts(self):
"""
Tests that buildroot_add_artifacts and tag_artifacts do not try to
tag already tagged artifacts
"""
builder = FakeKojiModuleBuilder(owner='Moe Szyslak',
module='nginx',
config=conf,
tag_name='module-nginx-1.2',
components=[])
builder.module_tag = {"name": "module-foo", "id": 1}
builder.module_build_tag = {"name": "module-foo-build", "id": 2}
# Set listTagged to return test data
tagged = [{"nvr": "foo-1.0-1.module_x"},
{"nvr": "bar-1.0-1.module_x"}]
builder.koji_session.listTagged.return_value = tagged
# Try to tag one artifact which is already tagged and one new ...
to_tag = ["foo-1.0-1.module_x", "new-1.0-1.module_x"]
builder.buildroot_add_artifacts(to_tag)
# ... only new one should be added.
builder.koji_session.tagBuild.assert_called_once_with(
builder.module_build_tag["id"], "new-1.0-1.module_x")
# Try the same for tag_artifacts(...).
builder.koji_session.tagBuild.reset_mock()
builder.tag_artifacts(to_tag)
builder.koji_session.tagBuild.assert_called_once_with(
builder.module_tag["id"], "new-1.0-1.module_x")
class TestGetKojiClientSession(unittest.TestCase):
@@ -94,31 +147,3 @@ class TestGetKojiClientSession(unittest.TestCase):
args, kwargs = mocked_krb_login.call_args
self.assertTrue(set([('proxyuser', self.owner)]).issubset(set(kwargs.items())))
class FakeKojiModuleBuilder(KojiModuleBuilder):
@module_build_service.utils.retry(wait_on=(xmlrpclib.ProtocolError, koji.GenericError))
def get_session(self, config, owner):
koji_config = munch.Munch(koji.read_config(
profile_name=config.koji_profile,
user_config=config.koji_config,
))
address = koji_config.server
koji_session = FakeKojiSession(address, opts=koji_config)
return koji_session
class FakeKojiSession(koji.ClientSession):
def _callMethod(self, name, args, kwargs=None):
pass
def _setup_connection(self):
pass
@module_build_service.utils.validate_koji_tag('tag')
def getRepo(self, tag):
return {'create_event': 'fake event'}