From 3e284035e8eecb9bc44ade2ecfa0f0e7241df96e Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Sep 02 2024 13:50:16 +0000
Subject: Set bundle format and set repo_releasever correctly


Pungi now automatically sets the version for the kiwibuild phase
based on the configuration, so this is now automatically propagated.

Set the bundle format for the various kiwi-built artifacts so they
match existing expectations.

Additionally, now the repo_releasever needs to be set correctly,
since version is now set by Pungi automatically.

Signed-off-by: Neal Gompa <ngompa@fedoraproject.org>

---

diff --git a/fedora-cloud.conf b/fedora-cloud.conf
index f5e325f..28ff1c5 100644
--- a/fedora-cloud.conf
+++ b/fedora-cloud.conf
@@ -144,6 +144,9 @@ global_target = 'f41'
 # kiwi image global configuration
 kiwibuild_description_scm = 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41'
 kiwibuild_description_path = 'Fedora.kiwi'
+kiwibuild_repo_releasever = release_version
+# all specifiers are passed through to kiwi
+kiwibuild_bundle_name_format = '%N-%v-%I.%A'
 
 # kiwi images need another target that uses old mock chroot
 kiwibuild_target = 'f41-kiwi'
diff --git a/fedora-container.conf b/fedora-container.conf
index 768074b..b5fedce 100644
--- a/fedora-container.conf
+++ b/fedora-container.conf
@@ -142,6 +142,9 @@ global_target = 'f41'
 # kiwi image global configuration
 kiwibuild_description_scm = 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41'
 kiwibuild_description_path = 'Fedora.kiwi'
+kiwibuild_repo_releasever = release_version
+# all specifiers are passed through to kiwi
+kiwibuild_bundle_name_format = '%N-%v-%I.%A.%T'
 
 
 kiwibuild = {
diff --git a/fedora.conf b/fedora.conf
index 5565f55..fb5e0f4 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -208,6 +208,9 @@ kiwibuild_target = 'f41-kiwi'
 # kiwi image global configuration
 kiwibuild_description_scm = 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41'
 kiwibuild_description_path = 'Fedora.kiwi'
+kiwibuild_repo_releasever = release_version
+# all specifiers are passed through to kiwi
+kiwibuild_bundle_name_format = '%N-%v-%I.%A'
 
 
 image_build = {
@@ -395,6 +398,7 @@ kiwibuild = {
             'arches': ['aarch64', 'x86_64'],
             'repos': ['Everything'],
             'subvariant': 'Cloud_Base',
+            'bundle_name_format': '%N-%v-%I.%A',
             'failable': ['*'],
         },
         {
@@ -426,6 +430,7 @@ kiwibuild = {
             'repos': ['Everything'],
             'subvariant': 'Container_Base',
             'target': global_target,
+            'bundle_name_format': '%N-%v-%I.%A.%T',
             'failable': ['*'],
         },
         {
@@ -434,6 +439,7 @@ kiwibuild = {
             'repos': ['Everything'],
             'subvariant': 'Container_Minimal_Base',
             'target': global_target,
+            'bundle_name_format': '%N-%v-%I.%A.%T',
             'failable': ['*'],
         },
         {
@@ -442,6 +448,7 @@ kiwibuild = {
             'repos': ['Everything'],
             'subvariant': 'Container_Toolbox',
             'target': global_target,
+            'bundle_name_format': '%N-%v-%I.%A.%T',
             'failable': [''],
         }
         ],