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

PR#4274: Don't prepopulate log list for mavenBuild

Browse source 
Merges #4274
https://pagure.io/koji/pull-request/4274

Fixes: #4273
https://pagure.io/koji/issue/4273
mavenBuild now fails on missing log files
This commit is contained in:
Tomas Kopecek 2024-12-04 17:16:42 +01:00
commit fccf4fa3f9
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
builder/kojid
View file

@ -2033,9 +2033,7 @@ class BuildMavenTask(BaseBuildTask):
os.path.join(outputdir, maven_info['artifact_id'] + '-' + os.path.join(outputdir, maven_info['artifact_id'] + '-' +
maven_info['version'] + '-patches.zip')) maven_info['version'] + '-patches.zip'))
logs = ['checkout.log'] logs = []
if self.opts.get('patches'):
logs.append('patches.log')
output_files = {} output_files = {}
for path, dirs, files in os.walk(outputdir): for path, dirs, files in os.walk(outputdir):
@ -2058,9 +2056,14 @@ class BuildMavenTask(BaseBuildTask):
self.uploadFile(os.path.join(outputdir, relpath, filename), self.uploadFile(os.path.join(outputdir, relpath, filename),
relPath=relpath) relPath=relpath)
# Also include the logs already upload by BuildRoot # Also include the logs already uploaded by BuildRoot
logs.extend(buildroot.logs) logs.extend(buildroot.logs)
# Also include the checkout logs (uploaded during checkout)
logs.append('checkout.log')
if self.opts.get('patches'):
logs.append('patches.log')
buildroot.expire() buildroot.expire()
return {'maven_info': maven_info, return {'maven_info': maven_info,