From 63fa7064515c6ab85383aee98d762da236d50cac Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Aug 21 2024 22:13:17 +0000 Subject: Consolidate kiwibuild configuration Some settings for the kiwibuild task can be set globally since pungi 4.6.3, so let's do that so we can make this configuration easier to update. Signed-off-by: Neal Gompa --- diff --git a/fedora-cloud.conf b/fedora-cloud.conf index 6e574eb..f5e325f 100644 --- a/fedora-cloud.conf +++ b/fedora-cloud.conf @@ -141,14 +141,16 @@ global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' global_version = '41' 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' + # kiwi images need another target that uses old mock chroot kiwibuild_target = 'f41-kiwi' kiwibuild = { '^Cloud$': [ { - 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41', - 'description_path': 'Fedora.kiwi', 'kiwi_profile': 'Cloud-Base-Generic', 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'repos': [ @@ -159,8 +161,6 @@ kiwibuild = { 'failable': ['ppc64le', 's390x'], }, { - 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41', - 'description_path': 'Fedora.kiwi', 'kiwi_profile': 'Cloud-Base-AmazonEC2', 'arches': ['aarch64', 'x86_64'], 'repos': [ @@ -171,8 +171,6 @@ kiwibuild = { 'failable': ['*'], }, { - 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41', - 'description_path': 'Fedora.kiwi', 'kiwi_profile': 'Cloud-Base-Azure', 'arches': ['aarch64', 'x86_64'], 'repos': [ @@ -183,8 +181,6 @@ kiwibuild = { 'failable': ['*'], }, { - 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41', - 'description_path': 'Fedora.kiwi', 'kiwi_profile': 'Cloud-Base-GCE', 'arches': ['aarch64', 'x86_64'], 'repos': [ @@ -195,8 +191,6 @@ kiwibuild = { 'failable': ['*'], }, { - 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41', - 'description_path': 'Fedora.kiwi', 'kiwi_profile': 'Cloud-Base-UEFI-UKI', 'arches': ['aarch64', 'x86_64'], 'repos': [ @@ -207,8 +201,6 @@ kiwibuild = { 'failable': ['*'], }, { - 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41', - 'description_path': 'Fedora.kiwi', 'kiwi_profile': 'Cloud-Base-Vagrant-libvirt', 'arches': ['aarch64', 'x86_64'], 'repos': [ @@ -219,8 +211,6 @@ kiwibuild = { 'failable': ['*'], }, { - 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41', - 'description_path': 'Fedora.kiwi', 'kiwi_profile': 'Cloud-Base-Vagrant-VirtualBox', 'arches': ['x86_64'], 'repos': [ diff --git a/fedora-container.conf b/fedora-container.conf index 364f39c..768074b 100644 --- a/fedora-container.conf +++ b/fedora-container.conf @@ -139,11 +139,14 @@ global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' global_version = '41' 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 = { '^Container$': [ { - 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41', - 'description_path': 'Fedora.kiwi', 'kiwi_profile': 'Container-Base-Generic', 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'repos': [ @@ -153,8 +156,6 @@ kiwibuild = { 'subvariant': 'Container_Base', }, { - 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41', - 'description_path': 'Fedora.kiwi', 'kiwi_profile': 'Container-Base-Generic-Minimal', 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'repos': [ @@ -164,8 +165,6 @@ kiwibuild = { 'subvariant': 'Container_Minimal_Base', }, { - 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41', - 'description_path': 'Fedora.kiwi', 'kiwi_profile': 'Container-Toolbox', 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'repos': [ diff --git a/fedora.conf b/fedora.conf index 0749c24..5565f55 100644 --- a/fedora.conf +++ b/fedora.conf @@ -205,6 +205,10 @@ global_target = 'f41' # kiwi images need another target that uses old mock chroot 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' + image_build = { '^Labs$': [ @@ -366,8 +370,6 @@ image_build = { kiwibuild = { '^Cloud$': [ { - 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41', - 'description_path': 'Fedora.kiwi', 'kiwi_profile': 'Cloud-Base-Generic', 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'repos': ['Everything'], @@ -375,8 +377,6 @@ kiwibuild = { 'failable': ['ppc64le', 's390x'], }, { - 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41', - 'description_path': 'Fedora.kiwi', 'kiwi_profile': 'Cloud-Base-AmazonEC2', 'arches': ['aarch64', 'x86_64'], 'repos': ['Everything'], @@ -384,8 +384,6 @@ kiwibuild = { 'failable': ['*'], }, { - 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41', - 'description_path': 'Fedora.kiwi', 'kiwi_profile': 'Cloud-Base-Azure', 'arches': ['aarch64', 'x86_64'], 'repos': ['Everything'], @@ -393,8 +391,6 @@ kiwibuild = { 'failable': ['*'], }, { - 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41', - 'description_path': 'Fedora.kiwi', 'kiwi_profile': 'Cloud-Base-GCE', 'arches': ['aarch64', 'x86_64'], 'repos': ['Everything'], @@ -402,8 +398,6 @@ kiwibuild = { 'failable': ['*'], }, { - 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41', - 'description_path': 'Fedora.kiwi', 'kiwi_profile': 'Cloud-Base-UEFI-UKI', 'arches': ['aarch64', 'x86_64'], 'repos': ['Everything'], @@ -411,8 +405,6 @@ kiwibuild = { 'failable': ['*'], }, { - 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41', - 'description_path': 'Fedora.kiwi', 'kiwi_profile': 'Cloud-Base-Vagrant-libvirt', 'arches': ['aarch64', 'x86_64'], 'repos': ['Everything'], @@ -420,8 +412,6 @@ kiwibuild = { 'failable': ['*'], }, { - 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41', - 'description_path': 'Fedora.kiwi', 'kiwi_profile': 'Cloud-Base-Vagrant-VirtualBox', 'arches': ['x86_64'], 'repos': ['Everything'], @@ -431,8 +421,6 @@ kiwibuild = { ], '^Container$': [ { - 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41', - 'description_path': 'Fedora.kiwi', 'kiwi_profile': 'Container-Base-Generic', 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'repos': ['Everything'], @@ -441,8 +429,6 @@ kiwibuild = { 'failable': ['*'], }, { - 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41', - 'description_path': 'Fedora.kiwi', 'kiwi_profile': 'Container-Base-Generic-Minimal', 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'repos': ['Everything'], @@ -451,8 +437,6 @@ kiwibuild = { 'failable': ['*'], }, { - 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41', - 'description_path': 'Fedora.kiwi', 'kiwi_profile': 'Container-Toolbox', 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'repos': ['Everything'],