From 1413a22c9a7074b2090523181c49502d6f2982c6 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Apr 22 2025 21:34:21 +0000
Subject: [PATCH 1/2] handle_container: drop no-longer-needed check for bogus metadata


The PR mentioned in the comment was merged months ago, and I
backported it for all stable branches. We shouldn't have this bad
metadata in any current composes any more.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

---

diff --git a/fedora-image-uploader/fedora_image_uploader/handler.py b/fedora-image-uploader/fedora_image_uploader/handler.py
index 400d4b2..a1e0e70 100644
--- a/fedora-image-uploader/fedora_image_uploader/handler.py
+++ b/fedora-image-uploader/fedora_image_uploader/handler.py
@@ -388,11 +388,6 @@ class Uploader:
             )
             # not a known container image type
             return
-        if image["type"] == "docker" and image["format"] == "tar.gz":
-            # this is a metadata error, it's a GCE cloud image
-            # fixed by https://pagure.io/pungi/pull-request/1788
-            # this check can be dropped after that is merged
-            return
         repos = self.conf["container"]["repos"]
         repo = repos.get(image["subvariant"])
         if not repo:

From e1eb83886c49d94e43e296d1b9a35fc2ef2fef11 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Apr 22 2025 21:36:38 +0000
Subject: [PATCH 2/2] handle_container: drop check for <F40 images


F39 is EOL now, so we don't need this.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

---

diff --git a/fedora-image-uploader/fedora_image_uploader/handler.py b/fedora-image-uploader/fedora_image_uploader/handler.py
index a1e0e70..9e59041 100644
--- a/fedora-image-uploader/fedora_image_uploader/handler.py
+++ b/fedora-image-uploader/fedora_image_uploader/handler.py
@@ -379,9 +379,6 @@ class Uploader:
             # Short-term fix: skip updates-testing builds until we have a testing repo
             _log.info("Skipping updates-testing image from compose id %s", ffrel.cid)
             return
-        if ffrel.release.lower() != "eln" and ffrel.relnum < 40:
-            _log.info("Skipping Fedora 39 images as they are not supported")
-            return
         if image["type"] not in ("docker", "ociarchive", "bootable-container", "container"):
             _log.debug(
                 "Skipping non-container image (type %s) in compose id %s", image["type"], ffrel.cid