mirror of
https://pagure.io/fm-orchestrator.git
synced 2026-04-14 02:29:44 +08:00
Port to libmodulemd and support v2 modulemd without module stream expansion
This commit is contained in:
@@ -21,11 +21,13 @@
|
||||
# Written by Ralph Bean <rbean@redhat.com>
|
||||
|
||||
import os
|
||||
from datetime import datetime
|
||||
|
||||
import module_build_service
|
||||
import modulemd
|
||||
import gi
|
||||
gi.require_version('Modulemd', '1.0') # noqa
|
||||
from gi.repository import Modulemd
|
||||
|
||||
from datetime import datetime
|
||||
from tests import db, clean_database
|
||||
from module_build_service.config import init_config
|
||||
from module_build_service.models import ModuleBuild, BUILD_STATES
|
||||
@@ -38,13 +40,12 @@ datadir = os.path.dirname(__file__) + '/data/'
|
||||
|
||||
|
||||
def module_build_from_modulemd(yaml):
|
||||
mmd = modulemd.ModuleMetadata()
|
||||
mmd.loads(yaml)
|
||||
|
||||
mmd = Modulemd.Module().new_from_string(yaml)
|
||||
mmd.upgrade()
|
||||
build = ModuleBuild()
|
||||
build.name = mmd.name
|
||||
build.stream = mmd.stream
|
||||
build.version = mmd.version
|
||||
build.name = mmd.get_name()
|
||||
build.stream = mmd.get_stream()
|
||||
build.version = mmd.get_version()
|
||||
build.state = BUILD_STATES['ready']
|
||||
build.modulemd = yaml
|
||||
build.koji_tag = None
|
||||
|
||||
@@ -22,7 +22,9 @@
|
||||
|
||||
import os
|
||||
|
||||
import modulemd
|
||||
import gi
|
||||
gi.require_version('Modulemd', '1.0') # noqa
|
||||
from gi.repository import Modulemd
|
||||
|
||||
from tests.test_models import init_data
|
||||
from module_build_service import conf
|
||||
@@ -63,10 +65,10 @@ class TestModels:
|
||||
""" Test that the build_context, runtime_context, and context hashes are correctly
|
||||
determined"""
|
||||
build = ModuleBuild.query.filter_by(id=1).one()
|
||||
mmd = modulemd.ModuleMetadata()
|
||||
yaml_path = os.path.join(
|
||||
os.path.dirname(__file__), '..', 'staged_data', 'testmodule_dependencies.yaml')
|
||||
mmd.load(yaml_path)
|
||||
mmd = Modulemd.Module().new_from_file(yaml_path)
|
||||
mmd.upgrade()
|
||||
build.modulemd = mmd.dumps()
|
||||
build.build_context, build.runtime_context = ModuleBuild.contexts_from_mmd(build.modulemd)
|
||||
assert build.build_context == 'f6e2aeec7576196241b9afa0b6b22acf2b6873d7'
|
||||
|
||||
Reference in New Issue
Block a user