Container flatpak detection #5496
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The image specific extra data is canonically inside the 'typeinfo' dictionary. Koji has mirrored one to the other for koji-containerbuild builds for a long time. See, e.g.: https://koji.fedoraproject.org/koji/buildinfo?buildID=1530154 From June 2020. (This seems to be the first with the mirroring.) Signed-off-by: Owen W. Taylor <otaylor@fishsoup.net>
owtaylor
force-pushed
the
container-flatpak-detection
branch
from
7268b3e
to
aa70130
Compare
Instead of looking for container_koji_task_id in the build extra, look for typeinfo.image. If we see typeinfo.image without pull specs (e.g., an ISO image), error out cleanly up front. Previously the code would assume an RPM update if you passed it the build NVR of an ISO image. Signed-off-by: Owen W. Taylor <otaylor@fishsoup.net>
mattiaverga
force-pushed
the
container-flatpak-detection
branch
from
aa70130
to
3c135c2
Compare
mattiaverga
approved these changes
Oct 3, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes a problem with the new system of building Flatpaks directly with on the builders, rather than using OSBS. The new koji-flatpak plugin doesn't set 'container_koji_task_id' in the extra metadata for the build, which broke content type detection.
See https://pagure.io/releng/issue/11697
There would be more simple ways of fixing things, but I tried to clean up a bit, rather than just leaving things broken so that unknown image types (all images aren't containers or Flatpaks...) were detected as RPM packages.
The cleanup only goes so far - I've left the test case for the new error catching a 500, rather than trying to cleanly catch this in the validatators. This was because I was pretty stumped at how to fit it in - there are multiple code paths that directly or indirectly call infer_content_class() (at least validate_acls and validate_build_uniqueness).
I've also switched the code from extra['image'] to extra['typeinfo']['image'], since that's been the preferred location for the metadata for quite some time.