add scmurl to ModuleBuild, get koji_tag from pdc, get_module works with module- prefix

This commit is contained in:
Lubos Kocman
2016-07-29 21:58:08 +02:00
parent 519d9fb937
commit cd6a5d03cc
3 changed files with 7 additions and 11 deletions

View File

@@ -112,6 +112,7 @@ def submit_build():
version=mmd.version,
release=mmd.release,
modulemd=yaml,
scmurl=url,
)
def failure(message, code):

View File

@@ -136,6 +136,7 @@ class ModuleBuild(Base):
state = Column(Integer, nullable=False)
modulemd = Column(String, nullable=False)
koji_tag = Column(String) # This gets set after 'wait'
scmurl = Column(String)
module = relationship('Module', backref='module_builds', lazy=False)
@@ -162,13 +163,14 @@ class ModuleBuild(Base):
return session.query(cls).filter(cls.id==event['msg']['id']).first()
@classmethod
def create(cls, session, conf, name, version, release, modulemd):
def create(cls, session, conf, name, version, release, modulemd, scmurl):
module = cls(
name=name,
version=version,
release=release,
state="init",
modulemd=modulemd,
scmurl=scmurl,
)
session.add(module)
session.commit()
@@ -223,9 +225,7 @@ class ModuleBuild(Base):
'release': self.release,
'state': self.state,
'state_name': INVERSE_BUILD_STATES[self.state],
# This is too spammy..
#'modulemd': self.modulemd,
'scmurl': self.scmurl,
# TODO, show their entire .json() ?
'component_builds': [build.id for build in self.component_builds],

View File

@@ -112,7 +112,7 @@ def variant_dict_from_str(module_str):
version_start = module_str.rfind('-', 0, release_start)
module_info['variant_release'] = module_str[release_start+1:]
module_info['variant_version'] = module_str[version_start+1:release_start]
module_info['variant_name'] = module_str[:version_start]
module_info['variant_name'] = module_str[:version_start].replace("module-", "")
module_info['variant_type'] = 'module'
return module_info
@@ -151,12 +151,7 @@ def get_module_tag(session, module_info, strict=False):
found. If strict=True, then a ValueError is raised.
:return: koji tag string
"""
# TODO -- get this from PDC some day... for now, we're just going to
# construct the module tag name from the module attrs we already know
# about.
#return get_module(session, module_info, strict=strict)['koji_tag']
variant_data = get_variant_dict(module_info)
return "{variant_name}-{variant_version}-{variant_release}".format(**variant_data)
return get_module(session, module_info, strict=strict)['koji_tag']
def module_depsolving_wrapper(session, module_list, strict=True):
"""