Merge ~tsimonq2/launchpad:buildinfo-lp1686242 into launchpad:master

[Simon Quigley]

Include buildinfo files in source and binary records for an upload (LP: #1686242)

When buildinfo files are uploaded, either by the packager or the buildd daemon,
they are stored by the librarian but not referenced in SourcePackageReleaseFile or
BinaryPackageFile appropriately. This adds the appropriate references, allowing the
files to be shown on the page.

Include buildinfo files in source and binary records for an upload (LP: #1686242)

When buildinfo files are uploaded, either by the packager or the buildd daemon, they are stored by the librarian but not referenced in SourcePackageReleaseFile or BinaryPackageFile appropriately. This adds the appropriate references, allowing the files to be shown on the page.

[Dimitri John Ledkov (xnox)]

This needs unit tests, for example webui tests to check these files appear.

[Dimitri John Ledkov (xnox)]

It would be best to be able to publish it in the apt archive maybe somehow.

[Colin Watson (cjwatson)]

I don't think this is the right approach. The buildinfo is already linked to the `SourcePackageRelease`/`BinaryPackageBuild` using dedicated columns, so we shouldn't make extra links for it via `SourcePackageReleaseFile`/`BinaryPackageFile` (especially not as a "generic" file). Instead, the API/UI layers should be changed to provide some way to get at the data that's already stored.

review: Needs Fixing

[Guruprasad (lgp171188)]

Hi Simon, the issue that this MP tries to fix has been fixed via https://code.launchpad.net/~wgrant/launchpad/+git/launchpad/+ref/buildinfo-exposure. So can you close this MP if there is nothing else to be done here?

Unmerged commits

e721bd2... by Simon Quigley on 2023-08-04

Include buildinfo files in source and binary records for an upload (LP: #1686242)

When buildinfo files are uploaded, either by the packager or the buildd daemon,
they are stored by the librarian but not referenced in SourcePackageReleaseFile or
BinaryPackageFile appropriately. This adds the appropriate references, allowing the
files to be shown on the page.

	docs:0 (build)
	lint:0 (build)
	mypy:0 (build)

1 → 3 of 3 results

First • Previous • Next • Last

diff --git a/lib/lp/archiveuploader/dscfile.py b/lib/lp/archiveuploader/dscfile.py
index 59b5087..0221c51 100644
--- a/lib/lp/archiveuploader/dscfile.py
+++ b/lib/lp/archiveuploader/dscfile.py
@@ -785,6 +785,8 @@ class DSCFile(SourceUploadFile, SignableTagFile):
             buildinfo=buildinfo_lfa,
         )
 
+        release.addFile(buildinfo_lfa, SourcePackageFileType.GENERIC)
+
         # SourcePackageFiles should contain also the DSC
         source_files = self.files + [self]
         for uploaded_file in source_files:
diff --git a/lib/lp/archiveuploader/nascentupload.py b/lib/lp/archiveuploader/nascentupload.py
index e7ecb7c..6da9e3d 100644
--- a/lib/lp/archiveuploader/nascentupload.py
+++ b/lib/lp/archiveuploader/nascentupload.py
@@ -49,7 +49,7 @@ from lp.soyuz.adapters.overrides import (
     FromExistingOverridePolicy,
     SourceOverride,
 )
-from lp.soyuz.enums import PackageUploadStatus
+from lp.soyuz.enums import BinaryPackageFileType, PackageUploadStatus
 from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
 from lp.soyuz.interfaces.component import IComponentSet
 from lp.soyuz.interfaces.queue import QueueInconsistentStateError
@@ -935,15 +935,15 @@ class NascentUpload:
                 assert (
                     self.queue_root.pocket == bpf_build.pocket
                 ), "Binary was not build for the claimed pocket."
-                binary_package_file.storeInDatabase(bpf_build)
+                bpf = binary_package_file.storeInDatabase(bpf_build)
                 if (
                     self.changes.buildinfo is not None
                     and bpf_build.buildinfo is None
                 ):
                     self.changes.buildinfo.checkBuild(bpf_build)
-                    bpf_build.addBuildInfo(
-                        self.changes.buildinfo.storeInDatabase()
-                    )
+                    buildinfo = self.changes.buildinfo.storeInDatabase()
+                    bpf_build.addBuildInfo(buildinfo)
+                    bpf.addFile(buildinfo, BinaryPackageFileType.GENERIC)
                 processed_builds.append(bpf_build)
 
             # Store the related builds after verifying they were built