From e6896b13c2757e3b36a574f83fffc74922470132 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 21 Dec 2023 09:04:37 -0500 Subject: platforms, tmt: Rename and restructure cloud variants We now have more than one cloud system that is essentially a KVM environment that uses cloud-init to boot, so now we declare that "generic" and have the OpenStack and Oracle images reuse those definitions. Also, in preparation for layered cloud image variants, rename them from "Cloud-" to "Cloud-Base-". Vagrant variants are similarly prefixed to make it clear who provides them. Finally, restructure the layout of the tmt plans to match the description structure. --- tmt/plans/build-aws.fmf | 8 -------- tmt/plans/build-azure.fmf | 8 -------- tmt/plans/build-gcp.fmf | 8 -------- tmt/plans/build-openstack.fmf | 8 -------- tmt/plans/build-vagrant-libvirt.fmf | 8 -------- tmt/plans/build-vagrant-virtualbox.fmf | 11 ----------- tmt/plans/cloud/base/build-aws.fmf | 8 ++++++++ tmt/plans/cloud/base/build-azure.fmf | 8 ++++++++ tmt/plans/cloud/base/build-gcp.fmf | 8 ++++++++ tmt/plans/cloud/base/build-generic.fmf | 8 ++++++++ tmt/plans/vagrant/base/build-libvirt.fmf | 8 ++++++++ tmt/plans/vagrant/base/build-virtualbox.fmf | 11 +++++++++++ 12 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 tmt/plans/build-aws.fmf delete mode 100644 tmt/plans/build-azure.fmf delete mode 100644 tmt/plans/build-gcp.fmf delete mode 100644 tmt/plans/build-openstack.fmf delete mode 100644 tmt/plans/build-vagrant-libvirt.fmf delete mode 100644 tmt/plans/build-vagrant-virtualbox.fmf create mode 100644 tmt/plans/cloud/base/build-aws.fmf create mode 100644 tmt/plans/cloud/base/build-azure.fmf create mode 100644 tmt/plans/cloud/base/build-gcp.fmf create mode 100644 tmt/plans/cloud/base/build-generic.fmf create mode 100644 tmt/plans/vagrant/base/build-libvirt.fmf create mode 100644 tmt/plans/vagrant/base/build-virtualbox.fmf (limited to 'tmt/plans') diff --git a/tmt/plans/build-aws.fmf b/tmt/plans/build-aws.fmf deleted file mode 100644 index 7f6a327..0000000 --- a/tmt/plans/build-aws.fmf +++ /dev/null @@ -1,8 +0,0 @@ -summary: Build AWS EC2 image -discover: - how: fmf -environment: - image_type: oem - image_profile: Cloud-AmazonEC2 -execute: - how: tmt diff --git a/tmt/plans/build-azure.fmf b/tmt/plans/build-azure.fmf deleted file mode 100644 index 6b43b63..0000000 --- a/tmt/plans/build-azure.fmf +++ /dev/null @@ -1,8 +0,0 @@ -summary: Build Azure image -discover: - how: fmf -environment: - image_type: oem - image_profile: Cloud-Azure -execute: - how: tmt diff --git a/tmt/plans/build-gcp.fmf b/tmt/plans/build-gcp.fmf deleted file mode 100644 index f5945da..0000000 --- a/tmt/plans/build-gcp.fmf +++ /dev/null @@ -1,8 +0,0 @@ -summary: Build GCP image -discover: - how: fmf -environment: - image_type: oem - image_profile: Cloud-GCE -execute: - how: tmt diff --git a/tmt/plans/build-openstack.fmf b/tmt/plans/build-openstack.fmf deleted file mode 100644 index 3f0eb22..0000000 --- a/tmt/plans/build-openstack.fmf +++ /dev/null @@ -1,8 +0,0 @@ -summary: Build OpenStack image -discover: - how: fmf -environment: - image_type: oem - image_profile: Cloud-OpenStack -execute: - how: tmt 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-vagrant-virtualbox.fmf b/tmt/plans/build-vagrant-virtualbox.fmf deleted file mode 100644 index d850aa8..0000000 --- a/tmt/plans/build-vagrant-virtualbox.fmf +++ /dev/null @@ -1,11 +0,0 @@ -summary: Build Vagrant image for VirtualBox -discover: - how: fmf -adjust: - enabled: false - when: arch != x86_64 -environment: - image_type: oem - image_profile: Vagrant-VirtualBox -execute: - how: tmt diff --git a/tmt/plans/cloud/base/build-aws.fmf b/tmt/plans/cloud/base/build-aws.fmf new file mode 100644 index 0000000..f2d2fe4 --- /dev/null +++ b/tmt/plans/cloud/base/build-aws.fmf @@ -0,0 +1,8 @@ +summary: Build AWS EC2 base image +discover: + how: fmf +environment: + image_type: oem + image_profile: Cloud-Base-AmazonEC2 +execute: + how: tmt diff --git a/tmt/plans/cloud/base/build-azure.fmf b/tmt/plans/cloud/base/build-azure.fmf new file mode 100644 index 0000000..970ee9a --- /dev/null +++ b/tmt/plans/cloud/base/build-azure.fmf @@ -0,0 +1,8 @@ +summary: Build Azure base image +discover: + how: fmf +environment: + image_type: oem + image_profile: Cloud-Base-Azure +execute: + how: tmt diff --git a/tmt/plans/cloud/base/build-gcp.fmf b/tmt/plans/cloud/base/build-gcp.fmf new file mode 100644 index 0000000..abe823c --- /dev/null +++ b/tmt/plans/cloud/base/build-gcp.fmf @@ -0,0 +1,8 @@ +summary: Build GCP base image +discover: + how: fmf +environment: + image_type: oem + image_profile: Cloud-Base-GCE +execute: + how: tmt diff --git a/tmt/plans/cloud/base/build-generic.fmf b/tmt/plans/cloud/base/build-generic.fmf new file mode 100644 index 0000000..752bf11 --- /dev/null +++ b/tmt/plans/cloud/base/build-generic.fmf @@ -0,0 +1,8 @@ +summary: Build Generic base image +discover: + how: fmf +environment: + image_type: oem + 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/vagrant/base/build-virtualbox.fmf b/tmt/plans/vagrant/base/build-virtualbox.fmf new file mode 100644 index 0000000..9fcd97e --- /dev/null +++ b/tmt/plans/vagrant/base/build-virtualbox.fmf @@ -0,0 +1,11 @@ +summary: Build base Vagrant image for VirtualBox +discover: + how: fmf +adjust: + enabled: false + when: arch != x86_64 +environment: + image_type: oem + image_profile: Cloud-Base-Vagrant-VirtualBox +execute: + how: tmt -- cgit v1.3.1+13