From 9fed822cc19acb6e6a719eefc6e3400deec64246 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Oct 08 2024 02:07:03 +0000
Subject: Build bootc images in IoT variant, tweak IoT image's subvariant


As discussed in
https://pagure.io/fedora-infra/ansible/pull-request/2295 , this
subvariant is more usable and in line with previous practice. It
will make life a bit easier for fedora-image-uploader. This also
tweaks the config to build both ostree container images in the
IoT variant and give them explicit subvariants, instead of
building them in their own variants and relying on the variant
to be inherited as the subvariant definition too. This just
seems a bit cleaner and avoids these variants showing up in the
metadata, which reads a bit oddly.

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

---

diff --git a/fedora-iot.conf b/fedora-iot.conf
index 11457e3..fd349ca 100644
--- a/fedora-iot.conf
+++ b/fedora-iot.conf
@@ -22,7 +22,7 @@ sigkeys = ['105ef944']
 tree_arches = ['aarch64', 'x86_64', "ppc64le", "s390x"]
 # limit tree variants
 # if undefined, all variants from variants.xml will be included
-tree_variants = ['IoT', 'bootc', 'bootc-base']
+tree_variants = ['IoT']
 hashed_directories = True
 
 # RUNROOT settings
@@ -273,24 +273,28 @@ ostree = {
 }
 
 ostree_container = {
-    "^bootc$": {
-        "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
-        "config_url": "https://pagure.io/fedora-iot/base-images",
-        "config_branch": "main",
-        "treefile": "fedora-bootc.yaml",
-        "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"],
-        "arches": ["x86_64", "aarch64", "ppc64le", "s390x"],
-        "failable": ['*'],
-    },
-    "^bootc-base$": {
-        "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
-        "config_url": "https://pagure.io/fedora-iot/ostree.git",
-        "config_branch": "main",
-        "treefile": "fedora-iot-bootc.yaml",
-        "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"],
-        "arches": ["x86_64", "aarch64"],
-        "failable": ['*'],
-    },
+    "^IoT$": [
+        {
+            "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
+            "config_url": "https://pagure.io/fedora-iot/base-images",
+            "config_branch": "main",
+            "treefile": "fedora-bootc.yaml",
+            "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"],
+            "arches": ["x86_64", "aarch64", "ppc64le", "s390x"],
+            "failable": ['*'],
+            "subvariant": "bootc",
+        },
+        {
+            "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
+            "config_url": "https://pagure.io/fedora-iot/ostree.git",
+            "config_branch": "main",
+            "treefile": "fedora-iot-bootc.yaml",
+            "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"],
+            "arches": ["x86_64", "aarch64"],
+            "failable": ['*'],
+            "subvariant": "IoT_bootc_base",
+        },
+    ]
 }
 
 koji_profile = 'compose_koji'