From 9f89e9dcbff18a0d28dedaca976a0cce2f60220a Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Jan 06 2026 19:56:09 +0000
Subject: Drop a couple of conditionals obsolete since F39 went EOL


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

---

diff --git a/fedora-image-uploader/fedora_image_uploader/aws.py b/fedora-image-uploader/fedora_image_uploader/aws.py
index 0c0569e..5477ef8 100644
--- a/fedora-image-uploader/fedora_image_uploader/aws.py
+++ b/fedora-image-uploader/fedora_image_uploader/aws.py
@@ -51,10 +51,7 @@ class Aws:
         if image.get("type") != "raw-xz":
             _log.debug("Skipping %s for AWS: type is %s", image.get("path"), image.get("type"))
             return
-        if (ffrel.relnum > 39 or ffrel.release.lower() == "eln") and "AmazonEC2" not in image.get(
-            "path", ""
-        ):
-            # Prior to F40, EC2 didn't have its own image build, Fedora-Cloud-Base was used
+        if "AmazonEC2" not in image.get("path", ""):
             _log.debug("Skipping %s for AWS: AmazonEC2 not in path", image.get("path"))
             return
 
diff --git a/fedora-image-uploader/fedora_image_uploader/gcp.py b/fedora-image-uploader/fedora_image_uploader/gcp.py
index 45ce7dd..b5565a5 100644
--- a/fedora-image-uploader/fedora_image_uploader/gcp.py
+++ b/fedora-image-uploader/fedora_image_uploader/gcp.py
@@ -56,11 +56,6 @@ class Gcp:
                 "Skipping %s for GCP: subvariant is %s", image.get("path"), image.get("arch")
             )
             return
-        if ffrel.relnum < 40 and ffrel.release.lower() != "eln":
-            # The format changed with F40 and I can't be bothered to support the old format for
-            # a month
-            _log.debug("Skipping %s for GCP: F{ffrel.relnum} not supported", image.get("path"))
-            return
 
         blob = self.upload_disk_image(image)
         try:
diff --git a/fedora-image-uploader/tests/test_aws.py b/fedora-image-uploader/tests/test_aws.py
index a22b870..b1245b3 100644
--- a/fedora-image-uploader/tests/test_aws.py
+++ b/fedora-image-uploader/tests/test_aws.py
@@ -620,7 +620,7 @@ def test_aws_nacks_boto_exceptions(mock_sleep, mock_client, fixtures_dir):
 @mock.patch.dict(config.conf["consumer_config"], {"aws": {"base_region": "us-east-1"}})
 def test_aws_filters():
     """Test the cases where the AWS handler should decide not to handle."""
-    ffrel = mock.MagicMock(relnum=39, release="39", label="RC-1.2", milestone="RC")
+    ffrel = mock.MagicMock(relnum=40, release="40", label="RC-1.2", milestone="RC")
     image = {
         "type": "notonewelike",
         "arch": "x86_64",
@@ -648,12 +648,11 @@ def test_aws_filters():
     aws_handler(image, ffrel)
     assert aws_handler.aws_register_image.call_count == 1
 
-    # No EC2 in path for 40+
-    ffrel.relnum = 40
+    # No EC2 in path
     aws_handler(image, ffrel)
     assert aws_handler.aws_register_image.call_count == 1
 
-    # No EC2 in path for 40+
+    # Now EC2 in path
     image["path"] = "Cloud/x86_64/images/Fedora-Cloud-Base-AmazonEC2.x86_64.raw.xz"
     aws_handler(image, ffrel)
     assert aws_handler.aws_register_image.call_count == 2
diff --git a/fedora-image-uploader/tests/test_gcp.py b/fedora-image-uploader/tests/test_gcp.py
index 0c6e6f4..a2493b0 100644
--- a/fedora-image-uploader/tests/test_gcp.py
+++ b/fedora-image-uploader/tests/test_gcp.py
@@ -52,10 +52,6 @@ def test_image_filter(fixtures_dir):
     handler(image, ffrel)
     handler.upload_disk_image.call_count == 0
 
-    # Don't bother with 39
-    handler(image, mock.Mock(relnum=39, release="39"))
-    handler.upload_disk_image.call_count == 0
-
 
 @pytest.mark.vcr
 @mock.patch.dict(