aboutsummaryrefslogtreecommitdiff
path: root/tmt
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
Diffstat (limited to 'tmt')
-rw-r--r--tmt/plans/base/tiny-disk.xml9
-rw-r--r--tmt/plans/build-aws.fmf8
-rw-r--r--tmt/plans/build-azure.fmf8
-rw-r--r--tmt/plans/build-gcp.fmf8
-rw-r--r--tmt/plans/build-openstack.fmf8
-rw-r--r--tmt/plans/build-vagrant-libvirt.fmf8
-rw-r--r--tmt/plans/build-vagrant-virtualbox.fmf (renamed from tmt/plans/asahi/build-fex-rootfs.fmf)7
-rw-r--r--tmt/plans/cloud/base/build-aws.fmf9
-rw-r--r--tmt/plans/cloud/base/build-azure.fmf9
-rw-r--r--tmt/plans/cloud/base/build-gcp.fmf9
-rw-r--r--tmt/plans/cloud/base/build-generic.fmf9
-rw-r--r--tmt/plans/cloud/base/build-uefi-uki.fmf9
-rw-r--r--tmt/plans/container/base/build-generic-init.fmf9
-rw-r--r--tmt/plans/container/base/build-generic-minimal.fmf9
-rw-r--r--tmt/plans/container/base/build-generic.fmf9
-rw-r--r--tmt/plans/container/toolbox/build-toolbox.fmf9
-rw-r--r--tmt/plans/desktop/kde/build-desktop-disk.fmf9
-rw-r--r--tmt/plans/desktop/kde/build-desktop-live.fmf18
-rw-r--r--tmt/plans/desktop/workstation/build-disk.fmf9
-rw-r--r--tmt/plans/desktop/workstation/build-live.fmf18
-rw-r--r--tmt/plans/server/guest/build-generic.fmf9
-rw-r--r--tmt/plans/server/host/build-generic.fmf9
-rw-r--r--tmt/plans/vagrant/base/build-libvirt.fmf9
-rw-r--r--tmt/plans/vagrant/base/build-virtualbox.fmf12
-rw-r--r--tmt/plans/wsl/build.fmf9
-rw-r--r--tmt/tests/build-image.fmf6
26 files changed, 44 insertions, 201 deletions
diff --git a/tmt/plans/base/tiny-disk.xml b/tmt/plans/base/tiny-disk.xml
deleted file mode 100644
index 98ee6ed..0000000
--- a/tmt/plans/base/tiny-disk.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: Build Tiny disk image
-discover:
- how: fmf
-environment:
- image_type: oem
- image_profile: Tiny-Disk
- kiwi_file: Fedora.kiwi
-execute:
- how: tmt
diff --git a/tmt/plans/build-aws.fmf b/tmt/plans/build-aws.fmf
new file mode 100644
index 0000000..7f6a327
--- /dev/null
+++ b/tmt/plans/build-aws.fmf
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 0000000..6b43b63
--- /dev/null
+++ b/tmt/plans/build-azure.fmf
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 0000000..f5945da
--- /dev/null
+++ b/tmt/plans/build-gcp.fmf
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 0000000..3f0eb22
--- /dev/null
+++ b/tmt/plans/build-openstack.fmf
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 0000000..7240ed1
--- /dev/null
+++ b/tmt/plans/build-vagrant-libvirt.fmf
@@ -0,0 +1,8 @@
+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/asahi/build-fex-rootfs.fmf b/tmt/plans/build-vagrant-virtualbox.fmf
index 30313f9..d850aa8 100644
--- a/tmt/plans/asahi/build-fex-rootfs.fmf
+++ b/tmt/plans/build-vagrant-virtualbox.fmf
@@ -1,12 +1,11 @@
-summary: Build FEX RootFS
+summary: Build Vagrant image for VirtualBox
discover:
how: fmf
adjust:
enabled: false
when: arch != x86_64
environment:
- image_type: erofs
- image_profile: FEX-RootFS
- kiwi_file: Fedora.kiwi
+ 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
deleted file mode 100644
index 758a3a0..0000000
--- a/tmt/plans/cloud/base/build-aws.fmf
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: Build AWS EC2 base image
-discover:
- how: fmf
-environment:
- image_type: oem
- image_profile: Cloud-Base-AmazonEC2
- kiwi_file: Fedora.kiwi
-execute:
- how: tmt
diff --git a/tmt/plans/cloud/base/build-azure.fmf b/tmt/plans/cloud/base/build-azure.fmf
deleted file mode 100644
index 4cc66ed..0000000
--- a/tmt/plans/cloud/base/build-azure.fmf
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: Build Azure base image
-discover:
- how: fmf
-environment:
- image_type: oem
- image_profile: Cloud-Base-Azure
- kiwi_file: Fedora.kiwi
-execute:
- how: tmt
diff --git a/tmt/plans/cloud/base/build-gcp.fmf b/tmt/plans/cloud/base/build-gcp.fmf
deleted file mode 100644
index e5ed99e..0000000
--- a/tmt/plans/cloud/base/build-gcp.fmf
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: Build GCP base image
-discover:
- how: fmf
-environment:
- image_type: oem
- image_profile: Cloud-Base-GCE
- kiwi_file: Fedora.kiwi
-execute:
- how: tmt
diff --git a/tmt/plans/cloud/base/build-generic.fmf b/tmt/plans/cloud/base/build-generic.fmf
deleted file mode 100644
index 864e137..0000000
--- a/tmt/plans/cloud/base/build-generic.fmf
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: Build Generic base image
-discover:
- how: fmf
-environment:
- image_type: oem
- image_profile: Cloud-Base-Generic
- kiwi_file: Fedora.kiwi
-execute:
- how: tmt
diff --git a/tmt/plans/cloud/base/build-uefi-uki.fmf b/tmt/plans/cloud/base/build-uefi-uki.fmf
deleted file mode 100644
index 3d1ad3c..0000000
--- a/tmt/plans/cloud/base/build-uefi-uki.fmf
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: Build UEFI UKI base image
-discover:
- how: fmf
-environment:
- image_type: oem
- image_profile: Cloud-Base-UEFI-UKI
- kiwi_file: Fedora.kiwi
-execute:
- how: tmt
diff --git a/tmt/plans/container/base/build-generic-init.fmf b/tmt/plans/container/base/build-generic-init.fmf
deleted file mode 100644
index 3a0e82a..0000000
--- a/tmt/plans/container/base/build-generic-init.fmf
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: Build Init Generic base container image
-discover:
- how: fmf
-environment:
- image_type: oci
- image_profile: Container-Base-Generic-Init
- kiwi_file: Fedora.kiwi
-execute:
- how: tmt
diff --git a/tmt/plans/container/base/build-generic-minimal.fmf b/tmt/plans/container/base/build-generic-minimal.fmf
deleted file mode 100644
index 9c192da..0000000
--- a/tmt/plans/container/base/build-generic-minimal.fmf
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: Build Minimal Generic base container image
-discover:
- how: fmf
-environment:
- image_type: oci
- image_profile: Container-Base-Generic-Minimal
- kiwi_file: Fedora.kiwi
-execute:
- how: tmt
diff --git a/tmt/plans/container/base/build-generic.fmf b/tmt/plans/container/base/build-generic.fmf
deleted file mode 100644
index c6c71db..0000000
--- a/tmt/plans/container/base/build-generic.fmf
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: Build Generic base container image
-discover:
- how: fmf
-environment:
- image_type: oci
- image_profile: Container-Base-Generic
- kiwi_file: Fedora.kiwi
-execute:
- how: tmt
diff --git a/tmt/plans/container/toolbox/build-toolbox.fmf b/tmt/plans/container/toolbox/build-toolbox.fmf
deleted file mode 100644
index 76f0567..0000000
--- a/tmt/plans/container/toolbox/build-toolbox.fmf
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: Build Toolbox container image
-discover:
- how: fmf
-environment:
- image_type: oci
- image_profile: Container-Toolbox
- kiwi_file: Fedora.kiwi
-execute:
- how: tmt
diff --git a/tmt/plans/desktop/kde/build-desktop-disk.fmf b/tmt/plans/desktop/kde/build-desktop-disk.fmf
deleted file mode 100644
index 11fcffb..0000000
--- a/tmt/plans/desktop/kde/build-desktop-disk.fmf
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: Build KDE Desktop disk image
-discover:
- how: fmf
-environment:
- image_type: oem
- image_profile: KDE-Desktop-Disk
- kiwi_file: Fedora.kiwi
-execute:
- how: tmt
diff --git a/tmt/plans/desktop/kde/build-desktop-live.fmf b/tmt/plans/desktop/kde/build-desktop-live.fmf
deleted file mode 100644
index 58ef3da..0000000
--- a/tmt/plans/desktop/kde/build-desktop-live.fmf
+++ /dev/null
@@ -1,18 +0,0 @@
-summary: Build KDE Desktop live image
-discover:
- how: fmf
-environment:
- image_type: iso
- image_profile: KDE-Desktop-Live
- kiwi_file: Fedora.kiwi
-execute:
- how: tmt
-provision:
- how: artemis
- hardware:
- cpu:
- # Add more CPUs to make mksquashfs faster
- processors: ">= 8"
- disk:
- # Increase disk size for better IO performance
- - size: '>=500 GiB'
diff --git a/tmt/plans/desktop/workstation/build-disk.fmf b/tmt/plans/desktop/workstation/build-disk.fmf
deleted file mode 100644
index 9718621..0000000
--- a/tmt/plans/desktop/workstation/build-disk.fmf
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: Build Workstation disk image
-discover:
- how: fmf
-environment:
- image_type: oem
- image_profile: Workstation-Disk
- kiwi_file: Fedora.kiwi
-execute:
- how: tmt
diff --git a/tmt/plans/desktop/workstation/build-live.fmf b/tmt/plans/desktop/workstation/build-live.fmf
deleted file mode 100644
index 2ecd287..0000000
--- a/tmt/plans/desktop/workstation/build-live.fmf
+++ /dev/null
@@ -1,18 +0,0 @@
-summary: Build Workstation live image
-discover:
- how: fmf
-environment:
- image_type: iso
- image_profile: Workstation-Live
- kiwi_file: Fedora.kiwi
-execute:
- how: tmt
-provision:
- how: artemis
- hardware:
- cpu:
- # Add more CPUs to make mksquashfs faster
- processors: ">= 8"
- disk:
- # Increase disk size for better IO performance
- - size: '>=500 GiB'
diff --git a/tmt/plans/server/guest/build-generic.fmf b/tmt/plans/server/guest/build-generic.fmf
deleted file mode 100644
index 252823d..0000000
--- a/tmt/plans/server/guest/build-generic.fmf
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: Build Generic guest image
-discover:
- how: fmf
-environment:
- image_type: oem
- image_profile: Server-Guest-Generic
- kiwi_file: Fedora.kiwi
-execute:
- how: tmt
diff --git a/tmt/plans/server/host/build-generic.fmf b/tmt/plans/server/host/build-generic.fmf
deleted file mode 100644
index d2279f2..0000000
--- a/tmt/plans/server/host/build-generic.fmf
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: Build Generic host image
-discover:
- how: fmf
-environment:
- image_type: oem
- image_profile: Server-Host-Generic
- kiwi_file: Fedora.kiwi
-execute:
- how: tmt
diff --git a/tmt/plans/vagrant/base/build-libvirt.fmf b/tmt/plans/vagrant/base/build-libvirt.fmf
deleted file mode 100644
index 5dc2751..0000000
--- a/tmt/plans/vagrant/base/build-libvirt.fmf
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: Build base Vagrant image for libvirt
-discover:
- how: fmf
-environment:
- image_type: oem
- image_profile: Cloud-Base-Vagrant-libvirt
- kiwi_file: Fedora.kiwi
-execute:
- how: tmt
diff --git a/tmt/plans/vagrant/base/build-virtualbox.fmf b/tmt/plans/vagrant/base/build-virtualbox.fmf
deleted file mode 100644
index 22878fe..0000000
--- a/tmt/plans/vagrant/base/build-virtualbox.fmf
+++ /dev/null
@@ -1,12 +0,0 @@
-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
- kiwi_file: Fedora.kiwi
-execute:
- how: tmt
diff --git a/tmt/plans/wsl/build.fmf b/tmt/plans/wsl/build.fmf
deleted file mode 100644
index beca94b..0000000
--- a/tmt/plans/wsl/build.fmf
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: Build the Windows Subsystem for Linux image
-discover:
- how: fmf
-environment:
- image_type: wsl
- image_profile: WSL-Base
- kiwi_file: Fedora.kiwi
-execute:
- how: tmt
diff --git a/tmt/tests/build-image.fmf b/tmt/tests/build-image.fmf
index 3a400cd..4bbfac6 100644
--- a/tmt/tests/build-image.fmf
+++ b/tmt/tests/build-image.fmf
@@ -3,13 +3,9 @@ require:
- distribution-gpg-keys
- git-core
- kiwi
- - kiwi-systemdeps-containers
- - kiwi-systemdeps-disk-images
- libselinux-utils
framework: shell
path: /
test: |
- ./kiwi-build --debug --image-type="$image_type" --image-profile="$image_profile" --kiwi-description-dir="${TMT_TREE}" --kiwi-file="$kiwi_file" --output-dir="${TMT_TEST_DATA}" --image-release="$(date --utc +'%Y%m%d.%H%M')"
- mv ${TMT_TEST_DATA}-build/build/image-root.log ${TMT_TEST_DATA}
- rm -rf "${TMT_TEST_DATA}-build"
+ ./kiwi-build --debug --image-type="$image_type" --image-profile="$image_profile" --kiwi-description-dir="${TMT_TREE}" --output-dir="${TMT_TEST_DATA}"
duration: 60m