From e8584a3d47204655a77d5c67b1fa7249c1bc1590 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Oct 01 2025 03:09:52 +0000
Subject: aws, gcp: update ELN subvariants


ELN now uses subvariants for all images to match CS and RHEL, which is
necessary to avoid collisions between images.

https://pagure.io/cloud-image-uploader/issue/62

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>

---

diff --git a/fedora-image-uploader/fedora_image_uploader/aws.py b/fedora-image-uploader/fedora_image_uploader/aws.py
index 05dd7bf..0c0569e 100644
--- a/fedora-image-uploader/fedora_image_uploader/aws.py
+++ b/fedora-image-uploader/fedora_image_uploader/aws.py
@@ -43,7 +43,7 @@ class Aws:
         if image["arch"] not in ("x86_64", "aarch64"):
             _log.debug("Skipping %s for AWS: unsupported arch %s", image.get("path"), image["arch"])
             return
-        if image.get("subvariant") not in ("Cloud_Base", "BaseOS"):
+        if image.get("subvariant") not in ("Cloud_Base", "ec2"):
             _log.debug(
                 "Skipping %s for AWS: subvariant is %s", image.get("path"), image.get("arch")
             )
diff --git a/fedora-image-uploader/fedora_image_uploader/gcp.py b/fedora-image-uploader/fedora_image_uploader/gcp.py
index 83695ec..45ce7dd 100644
--- a/fedora-image-uploader/fedora_image_uploader/gcp.py
+++ b/fedora-image-uploader/fedora_image_uploader/gcp.py
@@ -51,7 +51,7 @@ class Gcp:
         if image.get("format") != "tar.gz":
             _log.debug(f"Skipping unsupported format '{image['format']}' (need tar.gz) for GCP")
             return
-        if image.get("subvariant") not in ("Cloud_Base", "BaseOS"):
+        if image.get("subvariant") not in ("Cloud_Base", "gce"):
             _log.debug(
                 "Skipping %s for GCP: subvariant is %s", image.get("path"), image.get("arch")
             )