From 0b466a659dd723e1561b080c218bf1a8cf3c7c37 Mon Sep 17 00:00:00 2001
From: Paul Whalen <pwhalen@fedoraproject.org>
Date: Oct 08 2024 17:44:52 +0000
Subject: Revert "Build bootc images in IoT variant, tweak IoT image's subvariant"


This reverts commit 9fed822cc19acb6e6a719eefc6e3400deec64246.

---

diff --git a/fedora-iot.conf b/fedora-iot.conf
index fd349ca..11457e3 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']
+tree_variants = ['IoT', 'bootc', 'bootc-base']
 hashed_directories = True
 
 # RUNROOT settings
@@ -273,28 +273,24 @@ ostree = {
 }
 
 ostree_container = {
-    "^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",
-        },
-    ]
+    "^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": ['*'],
+    },
 }
 
 koji_profile = 'compose_koji'