particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

track Maven archives downloaded during the build process

Browse source
This commit is contained in:
Mike Bonnet 2008-01-17 17:07:33 -05:00
parent 0ab3e4e541
commit e241d8d9ed
3 changed files with 139 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

34
builder/kojid
View file

@ -543,30 +543,44 @@ class BuildRoot(object):
to satisfy build requirements.
Each member of the list is a dictionary containing the following fields:
- name
- version
- release
- epoch
- pom: a dict of Maven POM info containing the groupId, artifactId, and version fields
- files: a list of files associated with that POM
"""
packages = []
for path, dirs, files in os.walk(os.path.join(repodir)):
for path, dirs, files in os.walk(repodir):
pom_info = None
maven_files = []
for repofile in files:
if repofile.endswith('.pom'):
# Found a pom file, process it
try:
pominfo = koji.parse_pom(path=os.path.join(path, repofile))
nvrinfo = koji.pom_to_nvr(pominfo)
packages.append(nvrinfo)
pom_info = koji.parse_pom(path=os.path.join(path, repofile))
maven_files.append(repofile)
except:
self.logger.error('Could not parse pom: %s' % repofile)
self.logger.error(''.join(traceback.format_exception(*sys.exc_info())))
continue
elif os.path.splitext(repofile)[1] in ('.md5', '.sha1'):
# generated by the Koji, not tracked
continue
elif repofile.startswith('maven-metadata') and repofile.endswith('.xml'):
# Maven throws these metadata files around all over the place, ignore them
continue
else:
maven_files.append(repofile)
if pom_info:
packages.append({'pom': pom_info, 'files': maven_files})
elif maven_files:
self.logger.error('Found files in repo with no associated .pom: %s' % ', '.join(maven_files))
return packages
def mavenBuild(self, sourcedir, outputdir, repodir, settingsfile):
session.host.setBuildRootState(self.id, 'BUILDING')
rv = self.mock(['--no-clean', '--chroot', '--', '/bin/bash' '-c', '{ cd %s && /usr/bin/mvn -s %s deploy -DaltDeploymentRepository=koji-output::default::file://%s; }' % (sourcedir[len(self.rootdir()):], settingsfile, outputdir[len(self.rootdir()):])], skip_setarch=True)
rv = self.mock(['--no-clean', '--chroot', '--', '/bin/bash', '-c', '{ cd %s && /usr/bin/mvn -s %s deploy -DaltDeploymentRepository=koji-output::default::file://%s; }' % (sourcedir[len(self.rootdir()):], settingsfile, outputdir[len(self.rootdir()):])], skip_setarch=True)
session.host.updateBuildRootList(self.id, self.getMavenPackageList(repodir))
# ignore newly-built archives we find in the repo, we'll import them soon
session.host.updateMavenBuildRootList(self.id, self.getMavenPackageList(repodir), ignore=self.getMavenPackageList(outputdir))
if rv:
self.expire()
raise koji.BuildrootError, 'error building Maven package, %s' % self._mockResult(rv)

102
hub/kojihub.py
View file

@ -2781,6 +2781,37 @@ def get_archive_file(archive_id, filename):
query.values = {'archive_id': archive_id, 'filename': filename}
return query.executeOne()
def find_maven_archive(maven_info, filename, queryOpts=None):
"""
Find information about the Maven archive associated with the
given Maven info and with the given filename.
maven_info is a dict that must contain 'group_id', 'artifact_id', and
'version' fields.
"""
tables = ('archiveinfo',)
columns = ('id', 'type_id', 'archiveinfo.build_id', 'buildroot_id', 'filename', 'size', 'md5sum')
aliases = ('id', 'type_id', 'build_id', 'buildroot_id', 'filename', 'size', 'md5sum')
joins = ('maven_builds ON archiveinfo.build_id = maven_builds.build_id',
'LEFT JOIN maven_archives ON archiveinfo.id = maven_archives.archive_id')
clauses = ('archiveinfo.filename = %(filename)s',
"""
(maven_builds.group_id = %(group_id)s and
maven_builds.artifact_id = %(artifact_id)s and
maven_builds.version = %(version)s)
OR
(maven_archives.group_id = %(group_id)s and
maven_archives.artifact_id = %(artifact_id)s and
maven_archives.version = %(version)s)
""")
values = maven_info.copy()
values['filename'] = filename
query = QueryProcessor(tables=tables, columns=columns, aliases=aliases,
joins=joins, clauses=clauses,
values=values,
opts=queryOpts)
return query.executeOne()
def _fetchMulti(query, values):
"""Run the query and return all rows"""
c = context.cnx.cursor()
@ -4281,7 +4312,7 @@ class QueryProcessor(object):
if values:
self.values = values
else:
self.value = {}
self.values = {}
if opts:
self.opts = opts
else:
@ -6276,6 +6307,37 @@ class BuildRoot(object):
raise koji.GenericError, "buildroot %(id)s in wrong state %(state)s" % self.data
self._setList(rpmlist,update=True)
def getArchiveList(self, queryOpts=None):
"""Get the list of archives in the buildroot"""
tables = ('archiveinfo',)
joins = ('buildroot_archives ON archiveinfo.id = buildroot_archives.archive_id',)
clauses = ('buildroot_archives.buildroot_id = %(id)i',)
columns = ('id', 'type_id', 'build_id', 'archiveinfo.buildroot_id', 'filename', 'size', 'md5sum')
aliases = ('id', 'type_id', 'build_id', 'buildroot_id', 'filename', 'size', 'md5sum')
query = QueryProcessor(tables=tables, columns=columns,
joins=joins, clauses=clauses,
values=self.data,
opts=queryOpts)
return query.execute()
def updateArchiveList(self, archives):
"""Update the list of archives in a buildroot"""
if self.data['state'] != koji.BR_STATES['BUILDING']:
raise koji.GenericError, "buildroot %(id)s in wrong state %(state)s" % self.data
current = dict([(r['id'], 1) for r in self.getArchiveList()])
archive_ids = []
for archive in archives:
if current.has_key(archive['id']):
continue
else:
archive_ids.append(archive['id'])
insert = """INSERT INTO buildroot_archives (buildroot_id, archive_id)
VALUES
(%(broot_id)i, %(archive_id)i)"""
broot_id = self.id
archive_ids.sort()
for archive_id in archive_ids:
_dml(insert, locals())
class Host(object):
@ -6775,6 +6837,44 @@ class HostExports(object):
br.assertTask(task_id)
return br.updateList(rpmlist)
def updateMavenBuildRootList(self, brootid, mavenlist, ignore, task_id=None):
host = Host()
host.verify()
if task_id is not None:
Task(task_id).assertHost(host.id)
br = BuildRoot(brootid)
br.assertHost(host.id)
if task_id is not None:
br.assertTask(task_id)
archives = []
for entry in mavenlist:
pom = entry['pom']
files = entry['files']
maven_info = {'group_id': pom['groupId'],
'artifact_id': pom['artifactId'],
'version': pom['version']}
for filename in files:
archiveinfo = find_maven_archive(maven_info, filename)
if archiveinfo:
archives.append(archiveinfo)
else:
# check if it's in the ignore list
for ignore_entry in ignore:
ignore_pom = ignore_entry['pom']
ignore_files = ignore_entry['files']
if pom['groupId'] == ignore_pom['groupId'] and \
pom['artifactId'] == ignore_pom['artifactId'] and \
pom['version'] == ignore_pom['version'] and \
filename in ignore_files:
# artifact is in the ignore list, don't bail out
break
else:
# artifact was not in the ignore list, raise an error
raise koji.BuildrootError, 'unknown file in buildroot: %s; groupId: %s, artifactId: %s, version: %s' % \
(filename, pom['groupId'], pom['artifactId'], pom['version'])
return br.updateArchiveList(archives)
def repoInit(self, tag, with_src=False):
"""Initialize a new repo for tag"""
host = Host()

14
koji/__init__.py
View file

@ -803,6 +803,20 @@ def pom_to_nvr(pominfo):
'epoch': None}
return nvr
def pom_to_maven_info(pominfo):
"""
Convert the output of parsing a POM into a format compatible
with the output of getMavenBuild.
The mapping is as follows:
- groupId: group_id
- artifactId: artifact_id
- version: version
"""
maveninfo = {'group_id': pominfo['groupId'],
'artifact_id': pominfo['artifactId'],
'version': pominfo['version']}
return maveninfo
def mavenLabel(maveninfo):
"""
Return a user-friendly label for the given maveninfo. maveninfo is