mirror of
https://pagure.io/fm-orchestrator.git
synced 2026-05-12 02:46:57 +08:00
6981449853
I discovered that local builds have been broken by recent (good) changes in dnf. At the end of every batch, we regenerate the local repo with createrepo and we also call modifyrepo to include the modulemd file as we progress. This was added in #467. What we really want, is for the modulemd file to be present at the *end* of the build. Recently, dnf started respecting the modulemd file natively, such that builds we built in batch0 would not show up in batch1. They would be present in the repo, but they would be marked as belonging to a module which was not enabled, and so could not be pulled in. Every module build would fail because module-srpm-macros was in a disabled module (the module being built at the time). This change makes it so that the module metadata is only added to the repo at the very end of the build. I moved it into a `finalize` method on the builder which the copr builder was using, and for symmetry's sake I moved the koji content generator code to the same method on that builder. There was a circular import issue to solve between the koji module builder and the koji content generator modules that generated a larger diff, but is mostly cosmetic and mock changes.
162 lines
6.9 KiB
Python
162 lines
6.9 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Copyright (c) 2016 Red Hat, Inc.
|
|
#
|
|
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
# of this software and associated documentation files (the "Software"), to deal
|
|
# in the Software without restriction, including without limitation the rights
|
|
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
# copies of the Software, and to permit persons to whom the Software is
|
|
# furnished to do so, subject to the following conditions:
|
|
#
|
|
# The above copyright notice and this permission notice shall be included in all
|
|
# copies or substantial portions of the Software.
|
|
#
|
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
# SOFTWARE.
|
|
#
|
|
# Written by Ralph Bean <rbean@redhat.com>
|
|
|
|
""" Handlers for koji component build events on the message bus. """
|
|
|
|
import logging
|
|
|
|
import module_build_service.builder
|
|
|
|
import koji
|
|
|
|
from module_build_service import models, log, messaging
|
|
|
|
logging.basicConfig(level=logging.DEBUG)
|
|
|
|
|
|
def _finalize(config, session, msg, state):
|
|
""" Called whenever a koji build completes or fails. """
|
|
|
|
# First, find our ModuleBuild associated with this component, if any.
|
|
component_build = models.ComponentBuild.from_component_event(session, msg)
|
|
try:
|
|
nvr = "{}-{}-{}".format(msg.build_name, msg.build_version,
|
|
msg.build_release)
|
|
except KeyError:
|
|
nvr = None
|
|
|
|
if not component_build:
|
|
log.debug("We have no record of %s" % nvr)
|
|
return
|
|
|
|
log.info("Saw relevant component build of %r from %r." % (nvr, msg.msg_id))
|
|
|
|
if msg.state_reason:
|
|
state_reason = msg.state_reason
|
|
elif state != koji.BUILD_STATES['COMPLETE']:
|
|
state_reason = "Failed to build artifact %s in Koji" % (msg.build_name)
|
|
else:
|
|
state_reason = ""
|
|
|
|
# Mark the state in the db.
|
|
component_build.state = state
|
|
component_build.nvr = nvr
|
|
component_build.state_reason = state_reason
|
|
session.commit()
|
|
|
|
parent = component_build.module_build
|
|
|
|
# If the macro build failed, then the module is doomed.
|
|
if (component_build.package == 'module-build-macros' and
|
|
state != koji.BUILD_STATES['COMPLETE']):
|
|
parent.transition(config, state=models.BUILD_STATES['failed'],
|
|
state_reason=state_reason)
|
|
session.commit()
|
|
return
|
|
|
|
further_work = []
|
|
|
|
# If there are no other components still building in a batch,
|
|
# we can tag all successfully built components in the batch.
|
|
unbuilt_components_in_batch = [
|
|
c for c in parent.current_batch()
|
|
if c.state == koji.BUILD_STATES['BUILDING'] or not c.state
|
|
]
|
|
if not unbuilt_components_in_batch:
|
|
failed_components_in_batch = [
|
|
c for c in parent.current_batch()
|
|
if (c.state in [koji.BUILD_STATES['FAILED'],
|
|
koji.BUILD_STATES['CANCELED']])
|
|
]
|
|
|
|
built_components_in_batch = [
|
|
c for c in parent.current_batch()
|
|
if c.state == koji.BUILD_STATES['COMPLETE']
|
|
]
|
|
|
|
builder = module_build_service.builder.GenericBuilder.create_from_module(
|
|
session, parent, config)
|
|
|
|
if failed_components_in_batch:
|
|
log.info("Batch done, but not tagging because of failed component builds. Will "
|
|
"transition the module to \"failed\"")
|
|
parent.transition(config, state=models.BUILD_STATES['failed'],
|
|
state_reason="Some components failed to build.")
|
|
session.commit()
|
|
return []
|
|
elif not built_components_in_batch:
|
|
# If there are no successfully built components in a batch, there is nothing to tag.
|
|
# The repository won't be regenerated in this case and therefore we generate fake repo
|
|
# change message here.
|
|
log.info("Batch done. No component to tag")
|
|
further_work += [messaging.KojiRepoChange(
|
|
'components::_finalize: fake msg',
|
|
builder.module_build_tag['name'])]
|
|
else:
|
|
built_component_nvrs_in_batch = [c.nvr for c in built_components_in_batch]
|
|
# tag && add to srpm-build group if neccessary
|
|
log.info("Batch done. Tagging %i component(s) in the build tag." % len(
|
|
built_component_nvrs_in_batch))
|
|
log.debug("%r" % built_component_nvrs_in_batch)
|
|
# TODO: install=component_build.build_time_only works here because module-build-macros
|
|
# is alone in its batch and the only component with build_time_only set. All other
|
|
# batches will have install=False. If we expand to have batches with a mix of
|
|
# build_time_only and not components, then this logic will need to change.
|
|
builder.buildroot_add_artifacts(
|
|
built_component_nvrs_in_batch, install=component_build.build_time_only)
|
|
|
|
# Do not tag packages which only belong to the build tag to the dest tag
|
|
component_nvrs_to_tag_in_dest = [c.nvr for c in built_components_in_batch
|
|
if c.build_time_only is False]
|
|
log.info("Tagging %i component(s) in the dest tag." % len(
|
|
component_nvrs_to_tag_in_dest))
|
|
if component_nvrs_to_tag_in_dest:
|
|
builder.tag_artifacts(component_nvrs_to_tag_in_dest)
|
|
|
|
session.commit()
|
|
elif (any([c.state != koji.BUILD_STATES['BUILDING']
|
|
for c in unbuilt_components_in_batch])):
|
|
# We are not in the middle of the batch building and
|
|
# we have some unbuilt components in this batch. We might hit the
|
|
# concurrent builds threshold in previous call of continue_batch_build
|
|
# done in repos.py:done(...), but because we have just finished one
|
|
# build, try to call continue_batch_build again so in case we hit the
|
|
# threshold previously, we will submit another build from this batch.
|
|
builder = module_build_service.builder.GenericBuilder.create_from_module(
|
|
session, parent, config)
|
|
further_work += module_build_service.utils.continue_batch_build(
|
|
config, parent, session, builder)
|
|
return further_work
|
|
|
|
|
|
def complete(config, session, msg):
|
|
return _finalize(config, session, msg, state=koji.BUILD_STATES['COMPLETE'])
|
|
|
|
|
|
def failed(config, session, msg):
|
|
return _finalize(config, session, msg, state=koji.BUILD_STATES['FAILED'])
|
|
|
|
|
|
def canceled(config, session, msg):
|
|
return _finalize(config, session, msg, state=koji.BUILD_STATES['CANCELED'])
|