modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-05-03 18:33:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix #276 - Use PDC to resolve buildroot components instead of MBS database

Browse Source
This commit is contained in:
Jan Kaluza
2017-01-10 14:29:54 +01:00
parent c6d8198ac8
commit dda47acab7
7 changed files with 130 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/__init__.py
View File

@@ -28,10 +28,34 @@ from module_build_service import db
from module_build_service.config import init_config
from module_build_service.models import ModuleBuild, ComponentBuild
from module_build_service.utils import insert_fake_baseruntime
import module_build_service.pdc
app = module_build_service.app
conf = init_config(app)
def local_resolve_profiles(pdc_session, mmd, keys):
"""
Returns the default srpm-buildroot and "buildroot" groups as they
would have been return from PDC.
We are not using real PDC for resolve_profiles in tests,
because it makes tests slower and depending on the remote dev
PDC instance which is not ideal.
"""
default_groups = {
'srpm-buildroot':
set(['shadow-utils', 'fedora-release', 'redhat-rpm-config',
'rpm-build', 'fedpkg-minimal', 'gnupg2', 'bash']),
'buildroot':
set(['unzip', 'fedora-release', 'tar', 'cpio', 'gawk',
'gcc', 'xz', 'sed', 'findutils', 'util-linux', 'bash',
'info', 'bzip2', 'grep', 'redhat-rpm-config',
'diffutils', 'make', 'patch', 'shadow-utils',
'coreutils', 'which', 'rpm-build', 'gzip', 'gcc-c++'])}
return default_groups
module_build_service.pdc.resolve_profiles = local_resolve_profiles
def init_data():
db.session.remove()

13
tests/test_build/test_build.py
View File

@@ -96,7 +96,18 @@ class TestModuleBuilder(GenericBuilder):
TestModuleBuilder.on_tag_artifacts_cb = None
def buildroot_connect(self, groups):
pass
default_groups = {
'srpm-build':
set(['shadow-utils', 'fedora-release', 'redhat-rpm-config',
'rpm-build', 'fedpkg-minimal', 'gnupg2', 'bash']),
'build':
set(['unzip', 'fedora-release', 'tar', 'cpio', 'gawk',
'gcc', 'xz', 'sed', 'findutils', 'util-linux', 'bash',
'info', 'bzip2', 'grep', 'redhat-rpm-config',
'diffutils', 'make', 'patch', 'shadow-utils',
'coreutils', 'which', 'rpm-build', 'gzip', 'gcc-c++'])}
if groups != default_groups:
raise ValueError("Wrong groups in TestModuleBuilder.buildroot_connect()")
def buildroot_prep(self):
pass