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.

7 files changed, 18 insertions, 18 deletions

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