From 058808ac619eea77a7be51816eb0c3777eae1c8d Mon Sep 17 00:00:00 2001 From: Trevor Cooper Date: Tue, 23 Jan 2024 21:25:49 -0800 Subject: [PATCH] add s390x machine, product(s) and assign test suites --- templates.fif.json | 136 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/templates.fif.json b/templates.fif.json index 854ffa40..de94fc71 100644 --- a/templates.fif.json +++ b/templates.fif.json @@ -36,6 +36,21 @@ "WORKER_CLASS": "qemu_aarch64" } }, + "s390x": { + "backend": "qemu", + "settings": { + "ARCH_BASE_MACHINE": "s390x", + "PART_TABLE_TYPE": "mbr", + "QEMU": "s390x", + "QEMU_APPEND": "bios /usr/share/qemu/390-ccw.img -boot once=cd0", + "QEMUMACHINE": "s390-ccw-virtio", + "QEMURAM": 4096, + "QEMU_VIDEO_DEVICE": "virtio-gpu", + "QEMU_MAX_MIGRATION_TIME": "480", + "QEMU_NO_KVM": "1", + "WORKER_CLASS": "qemu_s390x" + } + }, "ppc64le": { "backend": "qemu", "settings": { @@ -99,6 +114,17 @@ }, "version": "*" }, + "rocky-boot-iso-s390x-*": { + "arch": "s390x", + "distri": "rocky", + "flavor": "boot-iso", + "settings": { + "GRUB": "ip=dhcp", + "HDDSIZEGB": "15", + "TEST_TARGET": "ISO" + }, + "version": "*" + }, "rocky-boot-iso-ppc64le-*": { "arch": "ppc64le", "distri": "rocky", @@ -133,6 +159,17 @@ }, "version": "*" }, + "rocky-minimal-iso-s390x-*": { + "arch": "s390x", + "distri": "rocky", + "flavor": "minimal-iso", + "settings": { + "DEPLOY_UPLOAD_TEST": "install_minimal_upload", + "HDDSIZEGB": "15", + "TEST_TARGET": "ISO" + }, + "version": "*" + }, "rocky-minimal-iso-ppc64le-*": { "arch": "ppc64le", "distri": "rocky", @@ -167,6 +204,17 @@ }, "version": "*" }, + "rocky-dvd-iso-s390x-*": { + "arch": "s390x", + "distri": "rocky", + "flavor": "dvd-iso", + "settings": { + "DEPLOY_UPLOAD_TEST": "install_default_upload", + "HDDSIZEGB": "15", + "TEST_TARGET": "ISO" + }, + "version": "*" + }, "rocky-dvd-iso-ppc64le-*": { "arch": "ppc64le", "distri": "rocky", @@ -200,6 +248,16 @@ }, "version": "*" }, + "rocky-package-set-s390x-*": { + "arch": "s390x", + "distri": "rocky", + "flavor": "package-set", + "settings": { + "HDDSIZEGB": "15", + "TEST_TARGET": "ISO" + }, + "version": "*" + }, "rocky-package-set-ppc64le-*": { "arch": "ppc64le", "distri": "rocky", @@ -230,6 +288,16 @@ }, "version": "*" }, + "rocky-universal-s390x-*": { + "arch": "s390x", + "distri": "rocky", + "flavor": "universal", + "settings": { + "HDDSIZEGB": "15", + "TEST_TARGET": "ISO" + }, + "version": "*" + }, "rocky-universal-ppc64le-*": { "arch": "ppc64le", "distri": "rocky", @@ -278,6 +346,10 @@ "machine": "uefi", "product": "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*" }, + "rocky-boot-iso-s390x-*-s390x": { + "machine": "s390x", + "product": "rocky-boot-iso-ppc64le-*" + }, "rocky-boot-iso-ppc64le-*-ppc64le": { "machine": "ppc64le", "product": "rocky-boot-iso-ppc64le-*" @@ -294,6 +366,10 @@ "machine": "uefi", "product": "rocky-boot-iso-x86_64-*" }, + "rocky-minimal-iso-s390x-*-s390x": { + "machine": "s390x", + "product": "rocky-minimal-iso-ppc64le-*" + }, "rocky-minimal-iso-ppc64le-*-ppc64le": { "machine": "ppc64le", "product": "rocky-minimal-iso-ppc64le-*" @@ -306,6 +382,10 @@ "machine": "64bit", "product": "rocky-minimal-iso-x86_64-*" }, + "rocky-dvd-iso-s390x-*-s390x": { + "machine": "s390x", + "product": "rocky-dvd-iso-ppc64le-*" + }, "rocky-dvd-iso-ppc64le-*-ppc64le": { "machine": "ppc64le", "product": "rocky-dvd-iso-ppc64le-*" @@ -322,6 +402,10 @@ "machine": "uefi", "product": "rocky-dvd-iso-x86_64-*" }, + "rocky-package-set-s390x-*-s390x": { + "machine": "s390x", + "product": "rocky-package-set-ppc64le-*" + }, "rocky-package-set-ppc64le-*-ppc64le": { "machine": "ppc64le", "product": "rocky-package-set-ppc64le-*" @@ -338,6 +422,10 @@ "machine": "64bit", "product": "rocky-package-set-x86_64-*" }, + "rocky-universal-s390x-*-s390x": { + "machine": "s390x", + "product": "rocky-universal-ppc64le-*" + }, "rocky-universal-ppc64le-*-ppc64le": { "machine": "ppc64le", "product": "rocky-universal-ppc64le-*" @@ -358,6 +446,7 @@ "TestSuites": { "anaconda_help": { "profiles": { + "rocky-dvd-iso-s390x-*-s390x": 20, "rocky-dvd-iso-ppc64le-*-ppc64le": 20, "rocky-dvd-iso-aarch64-*-aarch64": 20, "rocky-dvd-iso-x86_64-*-64bit": 20 @@ -373,6 +462,7 @@ "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-uefi": 30, "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-64bit": 30, "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-uefi": 30, + "rocky-dvd-iso-s390x-*-s390x": 20, "rocky-dvd-iso-ppc64le-*-ppc64le": 20, "rocky-dvd-iso-aarch64-*-aarch64": 20, "rocky-dvd-iso-x86_64-*-64bit": 20 @@ -393,6 +483,7 @@ "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-uefi": 30, "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-64bit": 30, "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-uefi": 30, + "rocky-dvd-iso-s390x-*-s390x": 20, "rocky-dvd-iso-ppc64le-*-ppc64le": 20, "rocky-dvd-iso-aarch64-*-aarch64": 20, "rocky-dvd-iso-x86_64-*-64bit": 20 @@ -413,6 +504,7 @@ "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-uefi": 30, "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-64bit": 30, "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-uefi": 30, + "rocky-dvd-iso-s390x-*-s390x": 20, "rocky-dvd-iso-ppc64le-*-ppc64le": 20, "rocky-dvd-iso-aarch64-*-aarch64": 20, "rocky-dvd-iso-x86_64-*-64bit": 20 @@ -433,6 +525,7 @@ "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-uefi": 30, "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-64bit": 30, "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-uefi": 30, + "rocky-dvd-iso-s390x-*-s390x": 40, "rocky-dvd-iso-ppc64le-*-ppc64le": 40, "rocky-dvd-iso-aarch64-*-aarch64": 40, "rocky-dvd-iso-x86_64-*-64bit": 40 @@ -453,6 +546,7 @@ "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-uefi": 30, "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-64bit": 30, "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-uefi": 30, + "rocky-dvd-iso-s390x-*-s390x": 40, "rocky-dvd-iso-ppc64le-*-ppc64le": 40, "rocky-dvd-iso-aarch64-*-aarch64": 40, "rocky-dvd-iso-x86_64-*-64bit": 40 @@ -473,6 +567,7 @@ "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-uefi": 30, "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-64bit": 30, "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-uefi": 30, + "rocky-dvd-iso-s390x-*-s390x": 40, "rocky-dvd-iso-ppc64le-*-ppc64le": 40, "rocky-dvd-iso-aarch64-*-aarch64": 40, "rocky-dvd-iso-x86_64-*-64bit": 40 @@ -493,6 +588,7 @@ "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-uefi": 30, "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-64bit": 30, "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-uefi": 30, + "rocky-dvd-iso-s390x-*-s390x": 40, "rocky-dvd-iso-ppc64le-*-ppc64le": 40, "rocky-dvd-iso-aarch64-*-aarch64": 40, "rocky-dvd-iso-x86_64-*-64bit": 40 @@ -520,6 +616,7 @@ }, "install_resize_lvm": { "profiles": { + "rocky-dvd-iso-s390x-*-s390x": 40, "rocky-dvd-iso-ppc64le-*-ppc64le": 40, "rocky-dvd-iso-aarch64-*-aarch64": 40, "rocky-dvd-iso-x86_64-*-64bit": 40 @@ -536,6 +633,7 @@ }, "install_anaconda_text": { "profiles": { + "rocky-universal-s390x-*-s390x": 20, "rocky-universal-ppc64le-*-ppc64le": 20, "rocky-universal-aarch64-*-aarch64": 20, "rocky-universal-x86_64-*-64bit": 20 @@ -546,6 +644,7 @@ }, "install_arabic_language": { "profiles": { + "rocky-universal-s390x-*-s390x": 40, "rocky-universal-ppc64le-*-ppc64le": 40, "rocky-universal-aarch64-*-aarch64": 40, "rocky-universal-x86_64-*-64bit": 40 @@ -565,6 +664,7 @@ }, "install_asian_language": { "profiles": { + "rocky-universal-s390x-*-s390x": 40, "rocky-universal-ppc64le-*-ppc64le": 40, "rocky-universal-aarch64-*-aarch64": 40, "rocky-universal-x86_64-*-64bit": 40 @@ -584,6 +684,7 @@ }, "install_custom_gui_lvm_ext4": { "profiles": { + "rocky-dvd-iso-s390x-*-s390x": 40, "rocky-dvd-iso-ppc64le-*-ppc64le": 40, "rocky-dvd-iso-aarch64-*-aarch64": 40, "rocky-dvd-iso-x86_64-*-64bit": 40, @@ -600,6 +701,7 @@ }, "install_custom_gui_standard_partition_ext4": { "profiles": { + "rocky-dvd-iso-s390x-*-s390x": 40, "rocky-dvd-iso-ppc64le-*-ppc64le": 40, "rocky-dvd-iso-aarch64-*-aarch64": 40, "rocky-dvd-iso-x86_64-*-64bit": 40, @@ -614,6 +716,7 @@ }, "install_custom_gui_software_raid": { "profiles": { + "rocky-universal-s390x-*-s390x": 40, "rocky-universal-ppc64le-*-ppc64le": 40, "rocky-universal-aarch64-*-aarch64": 40, "rocky-universal-x86_64-*-64bit": 40, @@ -630,6 +733,7 @@ }, "install_custom_gui_xfs": { "profiles": { + "rocky-universal-s390x-*-s390x": 40, "rocky-universal-ppc64le-*-ppc64le": 40, "rocky-universal-aarch64-*-aarch64": 40, "rocky-universal-x86_64-*-64bit": 40, @@ -645,6 +749,7 @@ }, "install_cyrillic_language": { "profiles": { + "rocky-universal-s390x-*-s390x": 40, "rocky-universal-ppc64le-*-ppc64le": 40, "rocky-universal-aarch64-*-aarch64": 40, "rocky-universal-x86_64-*-64bit": 40 @@ -664,10 +769,12 @@ }, "install_default": { "profiles": { + "rocky-boot-iso-s390x-*-s390x": 10, "rocky-boot-iso-ppc64le-*-ppc64le": 10, "rocky-boot-iso-aarch64-*-aarch64": 10, "rocky-boot-iso-x86_64-*-64bit": 10, "rocky-boot-iso-x86_64-*-uefi": 11, + "rocky-dvd-iso-s390x-*-s390x": 11, "rocky-dvd-iso-ppc64le-*-ppc64le": 11, "rocky-dvd-iso-aarch64-*-aarch64": 11, "rocky-dvd-iso-x86_64-*-uefi": 11 @@ -680,6 +787,7 @@ }, "install_minimal": { "profiles": { + "rocky-minimal-iso-s390x-*-s390x": 10, "rocky-minimal-iso-ppc64le-*-ppc64le": 10, "rocky-minimal-iso-aarch64-*-aarch64": 10, "rocky-minimal-iso-x86_64-*-64bit": 10 @@ -691,6 +799,7 @@ }, "install_minimal_upload": { "profiles": { + "rocky-minimal-iso-s390x-*-s390x": 10, "rocky-minimal-iso-ppc64le-*-ppc64le": 10, "rocky-minimal-iso-aarch64-*-aarch64": 10, "rocky-minimal-iso-x86_64-*-64bit": 10 @@ -703,6 +812,7 @@ }, "install_default_upload": { "profiles": { + "rocky-dvd-iso-s390x-*-s390x": 10, "rocky-dvd-iso-ppc64le-*-ppc64le": 10, "rocky-dvd-iso-aarch64-*-aarch64": 10, "rocky-dvd-iso-x86_64-*-64bit": 10 @@ -716,6 +826,7 @@ }, "install_delete_partial": { "profiles": { + "rocky-universal-s390x-*-s390x": 30, "rocky-universal-ppc64le-*-ppc64le": 30, "rocky-universal-aarch64-*-aarch64": 30, "rocky-universal-x86_64-*-64bit": 30, @@ -731,6 +842,7 @@ }, "install_delete_pata": { "profiles": { + "rocky-universal-s390x-*-s390x": 20, "rocky-universal-ppc64le-*-ppc64le": 20, "rocky-universal-aarch64-*-aarch64": 20, "rocky-universal-x86_64-*-64bit": 20, @@ -747,6 +859,7 @@ }, "install_european_language": { "profiles": { + "rocky-universal-s390x-*-s390x": 40, "rocky-universal-ppc64le-*-ppc64le": 40, "rocky-universal-aarch64-*-aarch64": 40, "rocky-universal-x86_64-*-64bit": 40 @@ -797,6 +910,7 @@ }, "install_lvmthin": { "profiles": { + "rocky-universal-s390x-*-s390x": 40, "rocky-universal-ppc64le-*-ppc64le": 40, "rocky-universal-aarch64-*-aarch64": 40, "rocky-universal-x86_64-*-64bit": 40, @@ -811,6 +925,7 @@ }, "install_lvm_ext4": { "profiles": { + "rocky-dvd-iso-s390x-*-s390x": 40, "rocky-dvd-iso-ppc64le-*-ppc64le": 40, "rocky-dvd-iso-aarch64-*-aarch64": 40, "rocky-dvd-iso-x86_64-*-64bit": 40, @@ -826,6 +941,7 @@ }, "install_standard_partition_ext4": { "profiles": { + "rocky-dvd-iso-s390x-*-s390x": 30, "rocky-dvd-iso-ppc64le-*-ppc64le": 30, "rocky-dvd-iso-aarch64-*-aarch64": 30, "rocky-dvd-iso-x86_64-*-64bit": 30, @@ -839,6 +955,7 @@ }, "install_mirrorlist_graphical": { "profiles": { + "rocky-universal-s390x-*-s390x": 20, "rocky-universal-ppc64le-*-ppc64le": 20, "rocky-universal-aarch64-*-aarch64": 20, "rocky-universal-x86_64-*-64bit": 20 @@ -850,6 +967,7 @@ }, "install_multi": { "profiles": { + "rocky-universal-s390x-*-s390x": 20, "rocky-universal-ppc64le-*-ppc64le": 20, "rocky-universal-aarch64-*-aarch64": 20, "rocky-universal-x86_64-*-64bit": 20, @@ -866,6 +984,7 @@ }, "install_multi_empty": { "profiles": { + "rocky-universal-s390x-*-s390x": 30, "rocky-universal-ppc64le-*-ppc64le": 30, "rocky-universal-aarch64-*-aarch64": 30, "rocky-universal-x86_64-*-64bit": 30, @@ -881,6 +1000,7 @@ }, "install_with_swap": { "profiles": { + "rocky-universal-s390x-*-s390x": 50, "rocky-universal-ppc64le-*-ppc64le": 50, "rocky-universal-aarch64-*-aarch64": 50, "rocky-universal-x86_64-*-64bit": 50, @@ -959,6 +1079,7 @@ }, "install_repository_http_graphical": { "profiles": { + "rocky-universal-s390x-*-s390x": 20, "rocky-universal-ppc64le-*-ppc64le": 20, "rocky-universal-aarch64-*-aarch64": 20, "rocky-universal-x86_64-*-64bit": 20 @@ -971,6 +1092,7 @@ }, "install_repository_http_variation": { "profiles": { + "rocky-universal-s390x-*-s390x": 20, "rocky-universal-ppc64le-*-ppc64le": 20, "rocky-universal-aarch64-*-aarch64": 20, "rocky-universal-x86_64-*-64bit": 20 @@ -983,6 +1105,7 @@ }, "install_repository_nfs_graphical": { "profiles": { + "rocky-dvd-iso-s390x-*-s390x": 30, "rocky-dvd-iso-ppc64le-*-ppc64le": 30, "rocky-dvd-iso-aarch64-*-aarch64": 30, "rocky-dvd-iso-x86_64-*-64bit": 30 @@ -1023,6 +1146,7 @@ }, "install_rescue_encrypted": { "profiles": { + "rocky-universal-s390x-*-s390x": 31, "rocky-universal-ppc64le-*-ppc64le": 31, "rocky-universal-aarch64-*-aarch64": 31, "rocky-universal-x86_64-*-64bit": 31, @@ -1037,6 +1161,7 @@ }, "install_sata": { "profiles": { + "rocky-universal-s390x-*-s390x": 20, "rocky-universal-ppc64le-*-ppc64le": 20, "rocky-universal-aarch64-*-aarch64": 20, "rocky-universal-x86_64-*-64bit": 20, @@ -1066,6 +1191,7 @@ }, "install_serial_console": { "profiles": { + "rocky-universal-s390x-*-s390x": 30, "rocky-universal-ppc64le-*-ppc64le": 30, "rocky-universal-aarch64-*-aarch64": 30, "rocky-universal-x86_64-*-64bit": 30 @@ -1079,6 +1205,7 @@ }, "install_shrink_ext4": { "profiles": { + "rocky-universal-s390x-*-s390x": 40, "rocky-universal-ppc64le-*-ppc64le": 40, "rocky-universal-aarch64-*-aarch64": 40, "rocky-universal-x86_64-*-64bit": 40 @@ -1093,6 +1220,7 @@ }, "install_shrink_ntfs": { "profiles": { + "rocky-universal-s390x-*-s390x": 40, "rocky-universal-ppc64le-*-ppc64le": 40, "rocky-universal-aarch64-*-aarch64": 40, "rocky-universal-x86_64-*-64bit": 40 @@ -1120,6 +1248,7 @@ }, "install_simple_free_space": { "profiles": { + "rocky-universal-s390x-*-s390x": 30, "rocky-universal-ppc64le-*-ppc64le": 30, "rocky-universal-aarch64-*-aarch64": 30, "rocky-universal-x86_64-*-64bit": 30, @@ -1136,6 +1265,7 @@ }, "install_software_raid": { "profiles": { + "rocky-universal-s390x-*-s390x": 30, "rocky-universal-ppc64le-*-ppc64le": 30, "rocky-universal-aarch64-*-aarch64": 30, "rocky-universal-x86_64-*-64bit": 30, @@ -1225,6 +1355,7 @@ }, "install_xfs": { "profiles": { + "rocky-universal-s390x-*-s390x": 40, "rocky-universal-ppc64le-*-ppc64le": 40, "rocky-universal-aarch64-*-aarch64": 40, "rocky-universal-x86_64-*-64bit": 40, @@ -1239,6 +1370,7 @@ }, "memtest": { "profiles": { + "rocky-universal-s390x-*-s390x": 30, "rocky-universal-ppc64le-*-ppc64le": 30, "rocky-universal-aarch64-*-aarch64": 30, "rocky-universal-x86_64-*-64bit": 30 @@ -1249,6 +1381,7 @@ }, "modularity_tests": { "profiles": { + "rocky-dvd-iso-s390x-*-s390x": 30, "rocky-dvd-iso-ppc64le-*-ppc64le": 30, "rocky-dvd-iso-aarch64-*-aarch64": 30, "rocky-dvd-iso-x86_64-*-64bit": 30 @@ -1301,6 +1434,7 @@ }, "release_identification": { "profiles": { + "rocky-dvd-iso-s390x-*-s390x": 40, "rocky-dvd-iso-ppc64le-*-ppc64le": 40, "rocky-dvd-iso-aarch64-*-aarch64": 40, "rocky-dvd-iso-x86_64-*-64bit": 40 @@ -1377,6 +1511,7 @@ }, "server_filesystem_default": { "profiles": { + "rocky-dvd-iso-s390x-*-s390x": 20, "rocky-dvd-iso-ppc64le-*-ppc64le": 20, "rocky-dvd-iso-aarch64-*-aarch64": 20, "rocky-dvd-iso-x86_64-*-64bit": 20 @@ -1393,6 +1528,7 @@ }, "server_firewall_default": { "profiles": { + "rocky-dvd-iso-s390x-*-s390x": 20, "rocky-dvd-iso-ppc64le-*-ppc64le": 20, "rocky-dvd-iso-aarch64-*-aarch64": 20, "rocky-dvd-iso-x86_64-*-64bit": 20