From 51f5a4ebef14aa6572926bb93a3b0b46124fdba0 Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Tue, 3 Dec 2024 16:54:09 +0100 Subject: [PATCH 1/2] Don't prepopulate log list for mavenBuild Related: https://pagure.io/koji/issue/4273 --- builder/kojid | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/builder/kojid b/builder/kojid index f369f50b..ba955123 100755 --- a/builder/kojid +++ b/builder/kojid @@ -2033,9 +2033,7 @@ class BuildMavenTask(BaseBuildTask): os.path.join(outputdir, maven_info['artifact_id'] + '-' + maven_info['version'] + '-patches.zip')) - logs = ['checkout.log'] - if self.opts.get('patches'): - logs.append('patches.log') + logs = [] output_files = {} for path, dirs, files in os.walk(outputdir): From 9a6b666926f600c34fd8b3ddbbc15f624bfd1d5f Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Tue, 3 Dec 2024 16:25:25 -0500 Subject: [PATCH 2/2] include the checkout logs in task result --- builder/kojid | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/builder/kojid b/builder/kojid index ba955123..8f8bf39c 100755 --- a/builder/kojid +++ b/builder/kojid @@ -2056,9 +2056,14 @@ class BuildMavenTask(BaseBuildTask): self.uploadFile(os.path.join(outputdir, relpath, filename), relPath=relpath) - # Also include the logs already upload by BuildRoot + # Also include the logs already uploaded by BuildRoot 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() return {'maven_info': maven_info,