From 749771647624e6be1f574fbf31b60aa0f90d0bbc Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Thu, 22 Feb 2024 19:15:21 -0500
Subject: Reorganize configuration around Fedora teams

This realigns the configuration into separate files/folders that
would be modified by specific teams (e.g. WGs and SIGs).
---
 teams/cloud/cloud.xml     | 150 ++++++++++++++++++++++++++++++++++++++++++++++
 teams/cloud/container.xml | 149 +++++++++++++++++++++++++++++++++++++++++++++
 teams/cloud/vagrant.xml   |  64 ++++++++++++++++++++
 3 files changed, 363 insertions(+)
 create mode 100644 teams/cloud/cloud.xml
 create mode 100644 teams/cloud/container.xml
 create mode 100644 teams/cloud/vagrant.xml

(limited to 'teams/cloud')

diff --git a/teams/cloud/cloud.xml b/teams/cloud/cloud.xml
new file mode 100644
index 0000000..32534f4
--- /dev/null
+++ b/teams/cloud/cloud.xml
@@ -0,0 +1,150 @@
+<image>
+	<profiles>
+		<profile name="CloudCore" description="Cloud spin core packages">
+			<requires profile="BootCore"/>
+		</profile>
+		<profile name="CloudCoreUKI" description="Cloud spin core packages for UKI">
+			<requires profile="BootCoreUKI"/>
+		</profile>
+		<profile name="Cloud-Base-Azure" description="Azure Base Guest Image">
+			<requires profile="CloudCore"/>
+		</profile>
+		<profile name="Cloud-Base-AmazonEC2" description="Amazon EC2 HVM Base Guest Image">
+			<requires profile="CloudCore"/>
+		</profile>
+		<profile name="Cloud-Base-GCE" description="GCE Base Guest Image">
+			<requires profile="CloudCore"/>
+		</profile>
+		<profile name="Cloud-Base-Generic" description="Generic Base Guest Image">
+			<requires profile="CloudCore"/>
+		</profile>
+		<profile name="Cloud-Base-UEFI-UKI" description="UEFI Base Guest Image using UKIs">
+			<requires profile="CloudCoreUKI"/>
+		</profile>
+		<profile name="Cloud-Base-OpenStack" description="OpenStack Base Guest Image">
+			<requires profile="Cloud-Base-Generic"/>
+		</profile>
+		<profile name="Cloud-Base-Oracle" description="Oracle Cloud Base Guest Image">
+			<requires profile="Cloud-Base-Generic"/>
+		</profile>
+	</profiles>
+	<preferences profiles="Cloud-Base-Azure">
+		<type image="oem" filesystem="btrfs" kernelcmdline="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8" devicepersistency="by-uuid" formatoptions="force_size" format="vhd-fixed" bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" fsmountoptions="compress=zstd:1" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora">
+			<bootloader name="grub2" console="serial" timeout="0"/>
+			<systemdisk>
+				<volume name="@root=root"/>
+				<volume name="home" parent="/"/>
+				<volume name="var" parent="/"/>
+			</systemdisk>
+			<size unit="G">5</size>
+			<oemconfig>
+				<oem-resize>false</oem-resize>
+			</oemconfig>
+		</type>
+	</preferences>
+	<preferences profiles="Cloud-Base-AmazonEC2">
+		<type image="oem" filesystem="btrfs" kernelcmdline="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8" devicepersistency="by-uuid" bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" fsmountoptions="compress=zstd:1" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora">
+			<bootloader name="grub2" timeout="0"/>
+			<size unit="G">5</size>
+			<systemdisk>
+				<volume name="@root=root"/>
+				<volume name="home" parent="/"/>
+				<volume name="var" parent="/"/>
+			</systemdisk>
+			<oemconfig>
+				<oem-resize>false</oem-resize>
+			</oemconfig>
+		</type>
+	</preferences>
+	<preferences profiles="Cloud-Base-GCE">
+		<type image="oem" filesystem="btrfs" kernelcmdline="no_timer_check net.ifnames=0 console=ttyS0,38400n8d" devicepersistency="by-uuid" bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" format="gce" firmware="uefi" fsmountoptions="compress=zstd:1" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora">
+			<bootloader name="grub2" timeout="0"/>
+			<size unit="G">5</size>
+			<systemdisk>
+				<volume name="@root=root"/>
+				<volume name="home" parent="/"/>
+				<volume name="var" parent="/"/>
+			</systemdisk>
+			<oemconfig>
+				<oem-resize>false</oem-resize>
+			</oemconfig>
+		</type>
+	</preferences>
+	<preferences profiles="Cloud-Base-Generic">
+		<type image="oem" filesystem="btrfs" kernelcmdline="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8" devicepersistency="by-uuid" bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" format="qcow2" fsmountoptions="compress=zstd:1" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora">
+			<bootloader name="grub2" timeout="0"/>
+			<size unit="G">5</size>
+			<systemdisk>
+				<volume name="@root=root"/>
+				<volume name="home" parent="/"/>
+				<volume name="var" parent="/"/>
+			</systemdisk>
+			<oemconfig>
+				<oem-resize>false</oem-resize>
+			</oemconfig>
+		</type>
+	</preferences>
+	<preferences profiles="Cloud-Base-UEFI-UKI">
+		<type image="oem" format="qcow2"
+		      firmware="uefi" efipartsize="1000"
+		      bootpartition="false"
+		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="true"
+		      devicepersistency="by-uuid"
+		      rootfs_label="fedora"
+		      initrd_system="none"
+		      editbootconfig="uki-editbootconfig.sh"
+		      >
+			<bootloader name="custom"/>
+			<size unit="G">5</size>
+			<systemdisk>
+				<volume name="@root=root"/>
+				<volume name="home" parent="/"/>
+				<volume name="var" parent="/"/>
+			</systemdisk>
+			<oemconfig>
+				<oem-resize>false</oem-resize>
+			</oemconfig>
+		</type>
+	</preferences>
+	<packages type="image" patternType="plusRecommended" profiles="CloudCore">
+		<namedCollection name="cloud-server-environment"/>
+		<ignore name="dracut-config-rescue"/>
+		<ignore name="firewalld"/>
+		<ignore name="kernel"/>
+		<ignore name="*-firmware"/>
+		<ignore name="geolite2-city"/>
+		<ignore name="geolite2-country"/>
+		<ignore name="plymouth"/>
+		<package name="python3-dnf-plugin-tracer"/>
+		<package name="glibc-langpack-en"/>
+	</packages>
+	<packages type="image" patternType="plusRecommended" profiles="CloudCoreUKI">
+		<namedCollection name="cloud-server-environment"/>
+		<ignore name="dracut-config-rescue"/>
+		<ignore name="firewalld"/>
+		<ignore name="kernel"/>
+		<ignore name="[a-oq-z]*-firmware"/>
+		<ignore name="geolite2-city"/>
+		<ignore name="geolite2-country"/>
+		<ignore name="plymouth"/>
+		<package name="python3-dnf-plugin-tracer"/>
+		<package name="glibc-langpack-en"/>
+	</packages>
+	<packages type="image" patternType="plusRecommended" profiles="Cloud-Base-Azure">
+		<package name="WALinuxAgent"/>
+	</packages>
+	<packages type="image" patternType="plusRecommended" profiles="Cloud-Base-GCE">
+		<package name="google-compute-engine-guest-configs"/>
+		<package name="google-compute-engine-oslogin"/>
+		<package name="google-guest-agent"/>
+	</packages>
+	<packages type="image" patternType="plusRecommended" profiles="Cloud-Base-Generic">
+		<package name="qemu-guest-agent"/>
+	</packages>
+	<packages type="image" patternType="plusRecommended" profiles="Cloud-Base-UEFI-UKI">
+		<package name="qemu-guest-agent"/>
+	</packages>
+	<packages type="uninstall" profiles="Cloud-Base-GCE">
+		<package name="cloud-init"/>
+	</packages>
+</image>
diff --git a/teams/cloud/container.xml b/teams/cloud/container.xml
new file mode 100644
index 0000000..2291a51
--- /dev/null
+++ b/teams/cloud/container.xml
@@ -0,0 +1,149 @@
+<image>
+	<profiles>
+		<profile name="ContainerCore" description="Container core packages">
+		</profile>
+		<profile name="Container-Base-Generic-Minimal" description="Generic Minimal Base Container Image">
+			<requires profile="ContainerCore"/>
+		</profile>
+		<profile name="Container-Base-Generic" description="Generic Base Container Image">
+			<requires profile="ContainerCore"/>
+		</profile>
+		<profile name="Container-Toolbox" description="Toolbox Container Image">
+			<requires profile="ContainerCore"/>
+		</profile>
+	</profiles>
+	<preferences profiles="Container-Base-Generic-Minimal,Container-Base-Generic">
+		<type image="tbz"/>
+		<timezone>Etc/UTC</timezone>
+		<locale>en_US</locale>
+		<rpm-locale-filtering>true</rpm-locale-filtering>
+		<rpm-excludedocs>true</rpm-excludedocs>
+	</preferences>
+	<preferences profiles="Container-Toolbox">
+		<type image="tbz"/>
+		<timezone>Etc/UTC</timezone>
+		<locale>en_US</locale>
+		<rpm-locale-filtering>false</rpm-locale-filtering>
+		<rpm-excludedocs>false</rpm-excludedocs>
+	</preferences>
+	<packages type="bootstrap" profiles="ContainerCore">
+		<ignore name="dosfstools"/>
+		<ignore name="e2fsprogs"/>
+		<ignore name="fuse-libs"/>
+		<ignore name="gnupg2-smime"/>
+		<ignore name="libss"/> <!-- used by e2fsprogs -->
+		<ignore name="kernel"/>
+		<ignore name="*-firmware"/>
+		<ignore name="geolite2-city"/>
+		<ignore name="geolite2-country"/>
+		<ignore name="pinentry"/>
+		<ignore name="shared-mime-info"/>
+		<ignore name="pinentry"/>
+		<ignore name="trousers"/>
+		<ignore name="xkeyboard-config"/>
+		<ignore name="grubby"/>
+		<ignore name="langpacks-en_GB"/>
+		<!-- https://bugzilla.redhat.com/show_bug.cgi?id=1951111 -->
+		<ignore name="util-linux"/>
+		<ignore name="sssd-client"/>
+		<package name="fedora-release-container"/>
+		<package name="bash"/>
+		<package name="coreutils"/>
+		<package name="rpm"/>
+	</packages>
+	<packages type="bootstrap" profiles="Container-Base-Generic-Minimal">
+		<ignore name="glibc-langpack-en"/>
+		<ignore name="langpacks-en"/>
+		<ignore name="tzdata"/>
+		<package name="microdnf"/>
+		<package name="glibc-minimal-langpack"/>
+	</packages>
+	<packages type="bootstrap" profiles="Container-Base-Generic">
+		<ignore name="glibc-langpack-en"/>
+		<ignore name="langpacks-en"/>
+		<package name="rootfiles"/>
+		<package name="tar"/> <!-- https://bugzilla.redhat.com/show_bug.cgi?id=1409920 -->
+		<package name="vim-minimal"/>
+		<package name="dnf"/>
+		<package name="dnf-yum"/> <!-- https://pagure.io/fesco/issue/1312#comment-30991 -->
+		<package name="glibc-minimal-langpack"/>
+		<package name="tzdata"/>
+	</packages>
+	<packages type="image" patternType="plusRecommended" profiles="Container-Toolbox">
+		<!-- This is a weak dep of systemd, we do not want this in the container;
+		     see: https://github.com/containers/toolbox/issues/1410  -->
+		<ignore name="systemd-resolved"/>
+		<package name="acl"/>
+		<package name="bash"/>
+		<package name="bash-completion"/>
+		<package name="bc"/>
+		<package name="bzip2"/>
+		<package name="coreutils-common"/>
+		<package name="curl"/>
+		<package name="default-editor"/>
+		<package name="diffutils"/>
+		<package name="dnf"/>
+		<package name="dnf-yum"/> <!-- https://pagure.io/fesco/issue/1312#comment-30991 -->
+		<package name="dnf-plugins-core"/>
+		<package name="findutils"/>
+		<package name="flatpak-spawn"/>
+		<package name="fpaste"/>
+		<package name="gawk"/>
+		<package name="git"/>
+		<package name="glibc-all-langpacks"/>
+		<package name="gnupg2"/>
+		<package name="gnupg2-smime"/>
+		<package name="grep"/>
+		<package name="gvfs-client"/>
+		<package name="gzip"/>
+		<package name="hostname"/>
+		<package name="iproute"/>
+		<package name="iputils"/>
+		<package name="keyutils"/>
+		<package name="krb5-libs"/>
+		<package name="less"/>
+		<package name="libcap"/>
+		<package name="lsof"/>
+		<package name="man-db"/>
+		<package name="man-pages"/>
+		<package name="mesa-dri-drivers"/>
+		<package name="mesa-va-drivers"/>
+		<package name="mesa-vulkan-drivers"/>
+		<package name="mtr"/>
+		<package name="nss-mdns"/>
+		<package name="openssh-clients"/>
+		<package name="openssl"/>
+		<package name="p11-kit"/>
+		<package name="pam"/>
+		<package name="passwd"/>
+		<package name="pigz"/>
+		<package name="procps-ng"/>
+		<package name="psmisc"/>
+		<package name="python3"/>
+		<package name="rootfiles"/>
+		<package name="rsync"/>
+		<package name="sed"/>
+		<package name="shadow-utils"/>
+		<package name="sudo"/>
+		<package name="tar"/> <!-- https://bugzilla.redhat.com/show_bug.cgi?id=1409920 -->
+		<package name="tcpdump"/>
+		<package name="time"/>
+		<package name="traceroute"/>
+		<package name="tree"/>
+		<package name="tzdata"/>
+		<package name="unzip"/>
+		<package name="util-linux"/>
+		<package name="util-linux-core"/>
+		<package name="vim-enhanced"/>
+		<package name="vte-profile"/>
+		<package name="vulkan-loader"/>
+		<package name="wget"/>
+		<package name="which"/>
+		<package name="whois"/>
+		<package name="words"/>
+		<package name="xorg-x11-xauth"/>
+		<package name="xz"/>
+		<package name="zip"/>
+		<package name="zstd"/>
+	</packages>
+</image>
diff --git a/teams/cloud/vagrant.xml b/teams/cloud/vagrant.xml
new file mode 100644
index 0000000..9c784ff
--- /dev/null
+++ b/teams/cloud/vagrant.xml
@@ -0,0 +1,64 @@
+<image>
+	<profiles>
+		<profile name="VagrantCore" description="Vagrant core packages">
+			<requires profile="CloudCore"/>
+		</profile>
+		<profile name="Cloud-Base-Vagrant-libvirt" description="Vagrant Base guest image for libvirt">
+			<requires profile="VagrantCore"/>
+		</profile>
+		<profile name="Cloud-Base-Vagrant-VirtualBox" description="Vagrant Base guest image for VirtualBox">
+			<requires profile="VagrantCore"/>
+		</profile>
+	</profiles>
+	<preferences profiles="Cloud-Base-Vagrant-libvirt">
+		<type image="oem" filesystem="btrfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" devicepersistency="by-uuid" bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" format="vagrant" fsmountoptions="compress=zstd:1" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora">
+			<bootloader name="grub2" console="serial" timeout="1"/>
+			<size unit="G">5</size>
+			<vagrantconfig provider="libvirt" virtualsize="5"/>
+			<systemdisk>
+				<volume name="@root=root"/>
+				<volume name="home" parent="/"/>
+				<volume name="var" parent="/"/>
+			</systemdisk>
+			<oemconfig>
+				<oem-resize>false</oem-resize>
+			</oemconfig>
+		</type>
+	</preferences>
+	<preferences profiles="Cloud-Base-Vagrant-VirtualBox">
+		<type image="oem" filesystem="btrfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" devicepersistency="by-uuid" bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" format="vagrant" fsmountoptions="compress=zstd:1" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora">
+			<bootloader name="grub2" console="serial" timeout="1"/>
+			<size unit="G">5</size>
+			<vagrantconfig provider="virtualbox" virtualbox_guest_additions_present="true" virtualsize="5"/>
+			<systemdisk>
+				<volume name="@root=root"/>
+				<volume name="home" parent="/"/>
+				<volume name="var" parent="/"/>
+			</systemdisk>
+			<oemconfig>
+				<oem-resize>false</oem-resize>
+			</oemconfig>
+		</type>
+	</preferences>
+	<users profiles="VagrantCore">
+		<!-- Standard password for the vagrant user, used by all images -->
+		<user name="vagrant" groups="vagrant" password="vagrant" home="/home/vagrant" pwdformat="plain" />
+		<user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root" groups="root"/>
+	</users>
+	<packages type="image" patternType="plusRecommended" profiles="VagrantCore">
+		<package name="dnf-yum"/>
+		<package name="rsync"/>
+		<package name="fuse-sshfs"/>
+		<package name="gdisk"/>
+		<package name="glibc-langpack-en"/>
+	</packages>
+	<packages type="image" patternType="plusRecommended" profiles="Cloud-Base-Vagrant-libvirt">
+		<package name="qemu-guest-agent"/>
+	</packages>
+	<packages type="image" patternType="plusRecommended" profiles="Cloud-Base-Vagrant-VirtualBox">
+		<package name="virtualbox-guest-additions"/>
+	</packages>
+	<packages type="uninstall" profiles="VagrantCore">
+		<package name="cloud-init"/>
+	</packages>
+</image>
-- 
cgit v1.3.1+13