diff options
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | platforms/cloud.xml | 31 | ||||
| -rw-r--r-- | platforms/vagrant.xml | 12 | ||||
| -rw-r--r-- | tmt/plans/build-vagrant-libvirt.fmf | 8 | ||||
| -rw-r--r-- | tmt/plans/cloud/base/build-aws.fmf (renamed from tmt/plans/build-openstack.fmf) | 4 | ||||
| -rw-r--r-- | tmt/plans/cloud/base/build-azure.fmf (renamed from tmt/plans/build-azure.fmf) | 4 | ||||
| -rw-r--r-- | tmt/plans/cloud/base/build-gcp.fmf (renamed from tmt/plans/build-gcp.fmf) | 4 | ||||
| -rw-r--r-- | tmt/plans/cloud/base/build-generic.fmf (renamed from tmt/plans/build-aws.fmf) | 4 | ||||
| -rw-r--r-- | tmt/plans/vagrant/base/build-libvirt.fmf | 8 | ||||
| -rw-r--r-- | tmt/plans/vagrant/base/build-virtualbox.fmf (renamed from tmt/plans/build-vagrant-virtualbox.fmf) | 4 |
10 files changed, 43 insertions, 40 deletions
@@ -8,9 +8,9 @@ All changes should be made via the PR workflow. ## Image variants -* Cloud Edition (image type: `oem`, image profiles: `Cloud-OpenStack`/`Cloud-AmazonEC2`/`Cloud-Azure`/`Cloud-GCE`/`Cloud-Oracle`) +* Base Cloud Edition for clouds (image type: `oem`, image profiles: `Cloud-Base-Generic`/`Cloud-Base-AmazonEC2`/`Cloud-Base-Azure`/`Cloud-Base-GCE`) +* Base Cloud Edition for Vagrant (image type: `oem`, image profiles: `Cloud-Base-Vagrant-libvirt`/`Cloud-Base-Vagrant-VirtualBox`) * KDE Spin (image type: `iso`, image profiles: `KDE-Live`) -* Vagrant Cloud Edition (image type: `oem`, image profiles: `Vagrant-libvirt`/`Vagrant-VirtualBox`) * Workstation Edition (image type: `iso`, image profiles: `Workstation-Live`) ## Image build quickstart diff --git a/platforms/cloud.xml b/platforms/cloud.xml index 62f86fe..2d5e28c 100644 --- a/platforms/cloud.xml +++ b/platforms/cloud.xml @@ -3,23 +3,26 @@ <profile name="CloudCore" description="Cloud spin core packages"> <requires profile="BootCore"/> </profile> - <profile name="Cloud-Azure" description="Azure Guest Image"> + <profile name="Cloud-Base-Azure" description="Azure Base Guest Image"> <requires profile="CloudCore"/> </profile> - <profile name="Cloud-AmazonEC2" description="Amazon EC2 HVM Guest Image"> + <profile name="Cloud-Base-AmazonEC2" description="Amazon EC2 HVM Base Guest Image"> <requires profile="CloudCore"/> </profile> - <profile name="Cloud-GCE" description="GCE Guest Image"> + <profile name="Cloud-Base-GCE" description="GCE Base Guest Image"> <requires profile="CloudCore"/> </profile> - <profile name="Cloud-OpenStack" description="OpenStack Guest Image"> + <profile name="Cloud-Base-Generic" description="Generic Base Guest Image"> <requires profile="CloudCore"/> </profile> - <profile name="Cloud-Oracle" description="Oracle Cloud Guest Image"> - <requires profile="Cloud-OpenStack"/> + <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-Azure"> + <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> @@ -33,7 +36,7 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-AmazonEC2"> + <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> @@ -47,7 +50,7 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-GCE"> + <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> @@ -61,7 +64,7 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-OpenStack"> + <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> @@ -87,18 +90,18 @@ <package name="python3-dnf-plugin-tracer"/> <package name="glibc-langpack-en"/> </packages> - <packages type="image" patternType="plusRecommended" profiles="Cloud-Azure"> + <packages type="image" patternType="plusRecommended" profiles="Cloud-Base-Azure"> <package name="WALinuxAgent"/> </packages> - <packages type="image" patternType="plusRecommended" profiles="Cloud-GCE"> + <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-OpenStack"> + <packages type="image" patternType="plusRecommended" profiles="Cloud-Base-Generic"> <package name="qemu-guest-agent"/> </packages> - <packages type="uninstall" profiles="Cloud-GCE"> + <packages type="uninstall" profiles="Cloud-Base-GCE"> <package name="cloud-init"/> </packages> </image> diff --git a/platforms/vagrant.xml b/platforms/vagrant.xml index 5dc45bf..9c784ff 100644 --- a/platforms/vagrant.xml +++ b/platforms/vagrant.xml @@ -3,14 +3,14 @@ <profile name="VagrantCore" description="Vagrant core packages"> <requires profile="CloudCore"/> </profile> - <profile name="Vagrant-libvirt" description="Vagrant guest image for libvirt"> + <profile name="Cloud-Base-Vagrant-libvirt" description="Vagrant Base guest image for libvirt"> <requires profile="VagrantCore"/> </profile> - <profile name="Vagrant-VirtualBox" description="Vagrant guest image for VirtualBox"> + <profile name="Cloud-Base-Vagrant-VirtualBox" description="Vagrant Base guest image for VirtualBox"> <requires profile="VagrantCore"/> </profile> </profiles> - <preferences profiles="Vagrant-libvirt"> + <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> @@ -25,7 +25,7 @@ </oemconfig> </type> </preferences> - <preferences profiles="Vagrant-VirtualBox"> + <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> @@ -52,10 +52,10 @@ <package name="gdisk"/> <package name="glibc-langpack-en"/> </packages> - <packages type="image" patternType="plusRecommended" profiles="Vagrant-libvirt"> + <packages type="image" patternType="plusRecommended" profiles="Cloud-Base-Vagrant-libvirt"> <package name="qemu-guest-agent"/> </packages> - <packages type="image" patternType="plusRecommended" profiles="Vagrant-VirtualBox"> + <packages type="image" patternType="plusRecommended" profiles="Cloud-Base-Vagrant-VirtualBox"> <package name="virtualbox-guest-additions"/> </packages> <packages type="uninstall" profiles="VagrantCore"> diff --git a/tmt/plans/build-vagrant-libvirt.fmf b/tmt/plans/build-vagrant-libvirt.fmf deleted file mode 100644 index 7240ed1..0000000 --- a/tmt/plans/build-vagrant-libvirt.fmf +++ /dev/null @@ -1,8 +0,0 @@ -summary: Build Vagrant image for libvirt -discover: - how: fmf -environment: - image_type: oem - image_profile: Vagrant-libvirt -execute: - how: tmt diff --git a/tmt/plans/build-openstack.fmf b/tmt/plans/cloud/base/build-aws.fmf index 3f0eb22..f2d2fe4 100644 --- a/tmt/plans/build-openstack.fmf +++ b/tmt/plans/cloud/base/build-aws.fmf @@ -1,8 +1,8 @@ -summary: Build OpenStack image +summary: Build AWS EC2 base image discover: how: fmf environment: image_type: oem - image_profile: Cloud-OpenStack + image_profile: Cloud-Base-AmazonEC2 execute: how: tmt diff --git a/tmt/plans/build-azure.fmf b/tmt/plans/cloud/base/build-azure.fmf index 6b43b63..970ee9a 100644 --- a/tmt/plans/build-azure.fmf +++ b/tmt/plans/cloud/base/build-azure.fmf @@ -1,8 +1,8 @@ -summary: Build Azure image +summary: Build Azure base image discover: how: fmf environment: image_type: oem - image_profile: Cloud-Azure + image_profile: Cloud-Base-Azure execute: how: tmt diff --git a/tmt/plans/build-gcp.fmf b/tmt/plans/cloud/base/build-gcp.fmf index f5945da..abe823c 100644 --- a/tmt/plans/build-gcp.fmf +++ b/tmt/plans/cloud/base/build-gcp.fmf @@ -1,8 +1,8 @@ -summary: Build GCP image +summary: Build GCP base image discover: how: fmf environment: image_type: oem - image_profile: Cloud-GCE + image_profile: Cloud-Base-GCE execute: how: tmt diff --git a/tmt/plans/build-aws.fmf b/tmt/plans/cloud/base/build-generic.fmf index 7f6a327..752bf11 100644 --- a/tmt/plans/build-aws.fmf +++ b/tmt/plans/cloud/base/build-generic.fmf @@ -1,8 +1,8 @@ -summary: Build AWS EC2 image +summary: Build Generic base image discover: how: fmf environment: image_type: oem - image_profile: Cloud-AmazonEC2 + image_profile: Cloud-Base-Generic execute: how: tmt diff --git a/tmt/plans/vagrant/base/build-libvirt.fmf b/tmt/plans/vagrant/base/build-libvirt.fmf new file mode 100644 index 0000000..8c49c19 --- /dev/null +++ b/tmt/plans/vagrant/base/build-libvirt.fmf @@ -0,0 +1,8 @@ +summary: Build base Vagrant image for libvirt +discover: + how: fmf +environment: + image_type: oem + image_profile: Cloud-Base-Vagrant-libvirt +execute: + how: tmt diff --git a/tmt/plans/build-vagrant-virtualbox.fmf b/tmt/plans/vagrant/base/build-virtualbox.fmf index d850aa8..9fcd97e 100644 --- a/tmt/plans/build-vagrant-virtualbox.fmf +++ b/tmt/plans/vagrant/base/build-virtualbox.fmf @@ -1,4 +1,4 @@ -summary: Build Vagrant image for VirtualBox +summary: Build base Vagrant image for VirtualBox discover: how: fmf adjust: @@ -6,6 +6,6 @@ adjust: when: arch != x86_64 environment: image_type: oem - image_profile: Vagrant-VirtualBox + image_profile: Cloud-Base-Vagrant-VirtualBox execute: how: tmt |