From 731a0bfd7b70ad33442706ba43bb21296725fe46 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Sep 06 2024 16:51:20 +0000
Subject: Replace ImageFactory with Kiwi


Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>

---

diff --git a/fedora/override.conf b/fedora/override.conf
index 0101d2b..c04f8b3 100644
--- a/fedora/override.conf
+++ b/fedora/override.conf
@@ -69,51 +69,57 @@ global_version = 'ELN'
 # live_images ignores this in favor of live_target
 global_target = 'eln'
 
-translate_paths = [ # required by image-build
-        ("/srv/odcs", "https://odcs.fedoraproject.org/composes"),
-]
+# kiwi images need another target that uses old mock chroot
+kiwibuild_target = 'eln-kiwi'
+
+# kiwi image global configuration
+kiwibuild_description_scm = 'git+https://pagure.io/fedora-kiwi-descriptions.git?#HEAD'
+kiwibuild_description_path = 'Fedora-ELN.kiwi'
+kiwibuild_version = '11'
+kiwibuild_repo_releasever = 'eln'
+
+# <name>-<version>-<ID>.<arch>
+kiwibuild_bundle_name_format = '%N-%v-%I.%A'
 
-image_build = {
-    "^BaseOS$": [
+kiwibuild = {
+    '^BaseOS$': [
+        {
+            'kiwi_profile': 'Cloud-Base-Generic',
+            'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
+            'repos': ['AppStream', 'CRB'],
+            'failable': ['*']
+        },
+        {
+            'kiwi_profile': 'Cloud-Base-Azure',
+            'arches': ['aarch64', 'x86_64'],
+            'repos': ['AppStream', 'CRB'],
+            'failable': ['*']
+        },
+        {
+            'kiwi_profile': 'Cloud-Base-AmazonEC2',
+            'arches': ['aarch64', 'x86_64'],
+            'repos': ['AppStream', 'CRB'],
+            'failable': ['*']
+        },
         {
-            "image-build": {
-                "format": [("qcow2", "qcow2")],
-                "name": "Fedora-ELN-Guest",
-                "version": "11.0",
-                "kickstart": "fedora-eln-guest.ks",
-                "ksversion": "F26",
-                "distro": "Fedora-20",
-                "disk-size": "10",
-                "arches": ["x86_64", "aarch64"],
-                'install_tree_from': 'BaseOS',
-                "repo": ["BaseOS","AppStream","CRB"],
-                "subvariant": "generic",
-                "failable": ["*"],
-            },
-            "factory-parameters": {
-                "generate_icicle": False,
-            }
+            'kiwi_profile': 'Cloud-Base-GCE',
+            'arches': ['aarch64', 'x86_64'],
+            'repos': ['AppStream', 'CRB'],
+            'failable': ['*']
         },
         {
-            'image-build': {
-                    'format': [('docker', 'tar.xz')],
-                    'name': 'Fedora-Container-Base',
-                    'kickstart': 'fedora-eln-container-base.ks',
-                    'distro': 'Fedora-22',
-                    'disk_size': 10,
-                    'repo': ["BaseOS","AppStream","CRB"],
-                    'install_tree_from': 'BaseOS',
-                    'subvariant': 'Container_Base',
-                    'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
-                    'failable': ['*'],
-                    },
-            'factory-parameters': {
-                'dockerversion': "1.10.1",
-                'docker_cmd':  '[ "/bin/bash" ]',
-                'docker_env': '[ "DISTTAG=elncontainer", "FGC=eln", "container=oci" ]',
-                'docker_label': '{ "name": "fedora-eln", "license": "MIT", "vendor": "Fedora Project", "version": "eln"}',
-            },
+            'kiwi_profile': 'Cloud-Base-UEFI-UKI',
+            'arches': ['aarch64', 'x86_64'],
+            'repos': ['AppStream', 'CRB'],
+            'failable': ['*']
         },
-    ],
+        {
+            'kiwi_profile': 'Container-Base-Generic',
+            'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
+            'repos': ['AppStream', 'CRB'],
+            'target': global_target,
+            'failable': ['*'],
+            'bundle_name_format': '%N-%s-%I.%A.%T'
+        },
+    ]
 }
-
diff --git a/shared/general.conf b/shared/general.conf
index 3396f64..6a66812 100644
--- a/shared/general.conf
+++ b/shared/general.conf
@@ -33,3 +33,9 @@ extra_files = [
         "*": EXTRA_FILES,
     }),
 ]
+
+# Needed for Kiwi image builds since they don't have access to /mnt/koji
+translate_paths = [
+   ('/mnt/koji/compose/', 'https://kojipkgs.fedoraproject.org/compose/'),
+   ("/srv/odcs", "https://odcs.fedoraproject.org/composes"),
+]