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

builder/repos: use artifact_name when reffering to a name and artifact when you refer NameVersionRelase

Browse Source 
* fixed wait_buildroot - pass buildInfos instad of nvrs
* add few debug messages to repos.py
This commit is contained in:
Lubos Kocman
2016-07-22 14:36:53 +02:00
parent 3b636cd2d0
commit 6c6a5b40b6
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rida/builder.py
View File

@@ -135,6 +135,7 @@ class GenericBuilder:
:param artifact_name : a crucial, since we can't guess a valid srpm name
without having the exact buildroot (collections/macros)
used e.g. for whitelisting packages
artifact_name is used to distinguish from artifact (e.g. package x nvr)
:param source : a scmurl to repository with receipt (e.g. spec)
"""
raise NotImplementedError()
@@ -181,27 +182,27 @@ class KojiModuleBuilder(GenericBuilder):
raise ValueError("No koji_arches specified in the config.")
# These eventually get populated when buildroot_{prep,resume} is called
self.module_tag = None
self.module_build_tag = None
self.module_target = None
self.module_tag = None # string
self.module_build_tag = None # string
self.module_target = None # A koji target dict
def __repr__(self):
return "<KojiModuleBuilder module: %s, tag: %s>" % (
self.module_str, self.tag_name)
def buildroot_ready(self, artifacts=None):
target_info = self.koji_session.getBuildTarget(self.module_target)
assert target_info, "Invalid build target"
assert self.module_target, "Invalid build target"
timeout = 120 # minutes see * 60
tag_id = target_info['build_tag']
tag_id = self.module_target['build_tag']
start = time.time()
last_repo = None
repo = self.koji_session.getRepo(tag_id)
builds = [ self.koji_session.getBuild(a) for a in artifacts or []]
while True:
if artifacts and repo and repo != last_repo:
if koji.util.checkForBuilds(self.koji_session, tag_id, artifacts, repo['create_event'], latest=True):
if builds and repo and repo != last_repo:
if koji.util.checkForBuilds(self.koji_session, tag_id, builds, repo['create_event'], latest=True):
return
if (time.time() - start) >= (timeout * 60.0):
@@ -211,7 +212,7 @@ class KojiModuleBuilder(GenericBuilder):
last_repo = repo
repo = self.koji_session.getRepo(tag_id)
if not artifacts:
if not builds:
if repo != last_repo:
return
@@ -389,6 +390,7 @@ chmod 644 %buildroot/%_rpmconfigdir/macro.modules
def build(self, artifact_name, source):
"""
:param source : scmurl to spec repository
: param artifact_name: name of artifact (which we couldn't get from spec due involved macros)
:return koji build task id
"""
# Taken from /usr/bin/koji
@@ -472,7 +474,7 @@ chmod 644 %buildroot/%_rpmconfigdir/macro.modules
def _koji_create_tag(self, tag_name, arches=None, fail_if_exists=True, perm=None):
print ("Creating tag %s" % tag_name)
log.debug("Creating tag %s" % tag_name)
chktag = self.koji_session.getTag(tag_name)
if chktag and fail_if_exists:
raise SystemError("Tag %s already exist" % tag_name)

3
rida/scheduler/handlers/repos.py
View File

@@ -57,8 +57,9 @@ def done(config, session, msg):
component_build.scmurl,
component_build.package,
))
log.info("Building artifact_name=%s from source=%s" % (component_build.package. component_build.scmurl))
component_build.task_id = builder.build(
artifact=component_build.package,
artifact_name=component_build.package,
source=component_build.scmurl,
)
session.commit()