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

MockModuleBuilder: Don't run the final createrepo if the module build failed

Browse Source 
The build steps assume that the the repository for the build is non-modular,
so after the final createrepo is run with include_module_yaml=True, it's
impossible to repeat a build steps. Running mock -c <failed_config> build is
quite useful for debugging a failed build (even though it's hard to find the
right config) - skipping the final createrepo step for failed module builds
makes it work as expected.
This commit is contained in:
Owen W. Taylor
2018-10-06 10:25:01 -04:00
parent d5747b19eb
commit b31fb65cef
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
module_build_service/builder/MockModuleBuilder.py
View File

@@ -46,7 +46,8 @@ from module_build_service.builder.utils import (
get_koji_config
)
from module_build_service.builder.KojiModuleBuilder import KojiModuleBuilder
from module_build_service.models import ModuleBuild
from module_build_service import models
logging.basicConfig(level=logging.DEBUG)
@@ -85,6 +86,7 @@ class MockModuleBuilder(GenericBuilder):
@module_build_service.utils.validate_koji_tag('tag_name')
def __init__(self, owner, module, config, tag_name, components):
self.module_str = module.name
self.module = module
self.tag_name = tag_name
self.config = config
self.groups = []
@@ -168,7 +170,7 @@ class MockModuleBuilder(GenericBuilder):
pkglist_f = open(pkglist, "w")
# Generate the mmd the same way as pungi does.
m1 = ModuleBuild.query.filter(ModuleBuild.name == self.module_str).one()
m1 = models.ModuleBuild.query.filter(models.ModuleBuild.name == self.module_str).one()
m1_mmd = m1.mmd()
artifacts = Modulemd.SimpleSet()
@@ -508,8 +510,11 @@ class MockModuleBuilder(GenericBuilder):
pass
def finalize(self):
# One last createrepo, to include the module metadata.
self._createrepo(include_module_yaml=True)
# If the state is "done", run one last createrepo, to include
# the module metadata. We don't want to do this for failed builds,
# since that makes it impossible to retry a build manually.
if self.module.state == models.BUILD_STATES["done"]:
self._createrepo(include_module_yaml=True)
class BaseBuilder(object):