srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-12-11 05:43:11 +00:00
Code Issues Releases Activity

Move most universal tests to Server-dvd-iso

Browse Source 
Per #196, the "universal" flavor doesn't really make much sense
as originally intended any more. The idea was for it to contain
tests that could run on any installer image, and it would be
scheduled for the "best" image for each arch in each compose.
This dated from before the composes were set up such that some
images are "fatal" - the compose is considered failed unless
that image composes - and when it was fairly likely that we'd
test a 'compose' with no Server DVD image.  These days it's much
less likely: the Server DVD image is fatal for release-blocking
arches (as of https://pagure.io/pungi-fedora/pull-request/935),
and even before that it hadn't failed in a completed compose for
years. Some of the so-called "universal" tests also don't really
work on netinst images (because of tap networking), and as the
final nail in the coffin, #196 points out that we can no longer
really treat all installer images as interchangeable for storage
tests, because they now use very different storage setups (Server
DVD uses xfs-on-LVM, others use btrfs).

To start with, here in the templates, we move most of the tests
into Server-dvd-iso, leaving only upgrade tests in 'universal',
which is now considered as being only for tests that use no
compose asset *at all*. To fully address #196, later commits will
add some of the tests to other flavors.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-11-06 11:07:05 -08:00
parent 3850a088bc
commit 0039535a77
1 changed files with 143 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

305
templates.fif.json
View File

@ -343,7 +343,7 @@
"distri": "fedora", "distri": "fedora",
"flavor": "universal", "flavor": "universal",
"settings": { "settings": {
"TEST_TARGET": "ISO" "TEST_TARGET": "COMPOSE"
}, },
"version": "*" "version": "*"
}, },
@ -352,7 +352,7 @@
"distri": "fedora", "distri": "fedora",
"flavor": "universal", "flavor": "universal",
"settings": { "settings": {
"TEST_TARGET": "ISO" "TEST_TARGET": "COMPOSE"
}, },
"version": "*" "version": "*"
}, },
@ -361,7 +361,7 @@
"distri": "fedora", "distri": "fedora",
"flavor": "universal", "flavor": "universal",
"settings": { "settings": {
"TEST_TARGET": "ISO" "TEST_TARGET": "COMPOSE"
}, },
"version": "*" "version": "*"
} }
@ -733,9 +733,9 @@
}, },
"install_blivet_resize_lvm": { "install_blivet_resize_lvm": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 20, "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
"fedora-universal-ppc64le-*-ppc64le": 20, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
"fedora-universal-x86_64-*-64bit": 20 "fedora-Server-dvd-iso-x86_64-*-64bit": 20
}, },
"settings": { "settings": {
"PARTITIONING": "custom_blivet_resize_lvm", "PARTITIONING": "custom_blivet_resize_lvm",
@ -746,9 +746,9 @@
}, },
"install_resize_lvm": { "install_resize_lvm": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 20, "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
"fedora-universal-ppc64le-*-ppc64le": 20, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
"fedora-universal-x86_64-*-64bit": 20 "fedora-Server-dvd-iso-x86_64-*-64bit": 20
}, },
"settings": { "settings": {
"PARTITIONING": "custom_resize_lvm", "PARTITIONING": "custom_resize_lvm",
@ -838,9 +838,9 @@
}, },
"install_anaconda_text": { "install_anaconda_text": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 20, "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
"fedora-universal-ppc64le-*-ppc64le": 20, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
"fedora-universal-x86_64-*-64bit": 20 "fedora-Server-dvd-iso-x86_64-*-64bit": 20
}, },
"settings": { "settings": {
"ANACONDA_TEXT": "1" "ANACONDA_TEXT": "1"
@ -848,9 +848,9 @@
}, },
"install_arabic_language": { "install_arabic_language": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 40, "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
"fedora-universal-ppc64le-*-ppc64le": 40, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
"fedora-universal-x86_64-*-64bit": 40 "fedora-Server-dvd-iso-x86_64-*-64bit": 40
}, },
"settings": { "settings": {
"DESKTOP": "gnome", "DESKTOP": "gnome",
@ -882,9 +882,9 @@
}, },
"install_asian_language": { "install_asian_language": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 40, "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
"fedora-universal-ppc64le-*-ppc64le": 40, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
"fedora-universal-x86_64-*-64bit": 40 "fedora-Server-dvd-iso-x86_64-*-64bit": 40
}, },
"settings": { "settings": {
"DESKTOP": "gnome", "DESKTOP": "gnome",
@ -902,10 +902,10 @@
}, },
"install_blivet_btrfs": { "install_blivet_btrfs": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 40, "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
"fedora-universal-ppc64le-*-ppc64le": 40, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
"fedora-universal-x86_64-*-64bit": 40, "fedora-Server-dvd-iso-x86_64-*-64bit": 40,
"fedora-universal-x86_64-*-uefi": 41 "fedora-Server-dvd-iso-x86_64-*-uefi": 41
}, },
"settings": { "settings": {
"PARTITIONING": "custom_blivet_btrfs", "PARTITIONING": "custom_blivet_btrfs",
@ -915,10 +915,10 @@
}, },
"install_blivet_lvmthin": { "install_blivet_lvmthin": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 40, "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
"fedora-universal-ppc64le-*-ppc64le": 40, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
"fedora-universal-x86_64-*-64bit": 40, "fedora-Server-dvd-iso-x86_64-*-64bit": 40,
"fedora-universal-x86_64-*-uefi": 41 "fedora-Server-dvd-iso-x86_64-*-uefi": 41
}, },
"settings": { "settings": {
"PARTITIONING": "custom_blivet_lvmthin", "PARTITIONING": "custom_blivet_lvmthin",
@ -928,10 +928,10 @@
}, },
"install_blivet_with_swap": { "install_blivet_with_swap": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 50, "fedora-Server-dvd-iso-aarch64-*-aarch64": 50,
"fedora-universal-ppc64le-*-ppc64le": 50, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 50,
"fedora-universal-x86_64-*-64bit": 50, "fedora-Server-dvd-iso-x86_64-*-64bit": 50,
"fedora-universal-x86_64-*-uefi": 51 "fedora-Server-dvd-iso-x86_64-*-uefi": 51
}, },
"settings": { "settings": {
"PARTITIONING": "custom_blivet_with_swap", "PARTITIONING": "custom_blivet_with_swap",
@ -941,10 +941,10 @@
}, },
"install_blivet_software_raid": { "install_blivet_software_raid": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 40, "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
"fedora-universal-ppc64le-*-ppc64le": 40, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
"fedora-universal-x86_64-*-64bit": 40, "fedora-Server-dvd-iso-x86_64-*-64bit": 40,
"fedora-universal-x86_64-*-uefi": 41 "fedora-Server-dvd-iso-x86_64-*-uefi": 41
}, },
"settings": { "settings": {
"NUMDISKS": "2", "NUMDISKS": "2",
@ -955,10 +955,10 @@
}, },
"install_blivet_xfs": { "install_blivet_xfs": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 40, "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
"fedora-universal-ppc64le-*-ppc64le": 40, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
"fedora-universal-x86_64-*-64bit": 40, "fedora-Server-dvd-iso-x86_64-*-64bit": 40,
"fedora-universal-x86_64-*-uefi": 41 "fedora-Server-dvd-iso-x86_64-*-uefi": 41
}, },
"settings": { "settings": {
"PARTITIONING": "custom_blivet_xfs", "PARTITIONING": "custom_blivet_xfs",
@ -968,10 +968,10 @@
}, },
"install_btrfs": { "install_btrfs": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 40, "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
"fedora-universal-ppc64le-*-ppc64le": 40, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
"fedora-universal-x86_64-*-64bit": 40, "fedora-Server-dvd-iso-x86_64-*-64bit": 40,
"fedora-universal-x86_64-*-uefi": 41 "fedora-Server-dvd-iso-x86_64-*-uefi": 41
}, },
"settings": { "settings": {
"PARTITIONING": "custom_btrfs", "PARTITIONING": "custom_btrfs",
@ -980,9 +980,9 @@
}, },
"install_cyrillic_language": { "install_cyrillic_language": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 40, "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
"fedora-universal-ppc64le-*-ppc64le": 40, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
"fedora-universal-x86_64-*-64bit": 40 "fedora-Server-dvd-iso-x86_64-*-64bit": 40
}, },
"settings": { "settings": {
"DESKTOP": "gnome", "DESKTOP": "gnome",
@ -1040,10 +1040,10 @@
}, },
"install_delete_partial": { "install_delete_partial": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 30, "fedora-Server-dvd-iso-aarch64-*-aarch64": 30,
"fedora-universal-ppc64le-*-ppc64le": 30, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
"fedora-universal-x86_64-*-64bit": 30, "fedora-Server-dvd-iso-x86_64-*-64bit": 30,
"fedora-universal-x86_64-*-uefi": 31 "fedora-Server-dvd-iso-x86_64-*-uefi": 31
}, },
"settings": { "settings": {
"HDD_1": "disk_full_%PART_TABLE_TYPE%.img", "HDD_1": "disk_full_%PART_TABLE_TYPE%.img",
@ -1053,8 +1053,8 @@
}, },
"install_delete_pata": { "install_delete_pata": {
"profiles": { "profiles": {
"fedora-universal-x86_64-*-64bit": 20, "fedora-Server-dvd-iso-x86_64-*-64bit": 20,
"fedora-universal-x86_64-*-uefi": 21 "fedora-Server-dvd-iso-x86_64-*-uefi": 21
}, },
"settings": { "settings": {
"HDDMODEL": "ide-hd", "HDDMODEL": "ide-hd",
@ -1064,9 +1064,9 @@
}, },
"install_european_language": { "install_european_language": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 40, "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
"fedora-universal-ppc64le-*-ppc64le": 40, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
"fedora-universal-x86_64-*-64bit": 40 "fedora-Server-dvd-iso-x86_64-*-64bit": 40
}, },
"settings": { "settings": {
"DESKTOP": "gnome", "DESKTOP": "gnome",
@ -1084,9 +1084,9 @@
}, },
"install_iscsi": { "install_iscsi": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 40, "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
"fedora-universal-ppc64le-*-ppc64le": 40, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
"fedora-universal-x86_64-*-64bit": 40 "fedora-Server-dvd-iso-x86_64-*-64bit": 40
}, },
"settings": { "settings": {
"ANACONDA_STATIC": "172.16.2.111", "ANACONDA_STATIC": "172.16.2.111",
@ -1100,9 +1100,9 @@
}, },
"install_kickstart_firewall_configured": { "install_kickstart_firewall_configured": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 20, "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
"fedora-universal-ppc64le-*-ppc64le": 20, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
"fedora-universal-x86_64-*-64bit": 20 "fedora-Server-dvd-iso-x86_64-*-64bit": 20
}, },
"settings": { "settings": {
"GRUB": "inst.ks=http://fedorapeople.org/groups/qa/kickstarts/firewall-configured-net.ks", "GRUB": "inst.ks=http://fedorapeople.org/groups/qa/kickstarts/firewall-configured-net.ks",
@ -1114,9 +1114,9 @@
}, },
"install_kickstart_firewall_disabled": { "install_kickstart_firewall_disabled": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 20, "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
"fedora-universal-ppc64le-*-ppc64le": 20, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
"fedora-universal-x86_64-*-64bit": 20 "fedora-Server-dvd-iso-x86_64-*-64bit": 20
}, },
"settings": { "settings": {
"GRUB": "inst.ks=http://fedorapeople.org/groups/qa/kickstarts/firewall-disabled-net.ks", "GRUB": "inst.ks=http://fedorapeople.org/groups/qa/kickstarts/firewall-disabled-net.ks",
@ -1128,9 +1128,9 @@
}, },
"install_kickstart_hdd": { "install_kickstart_hdd": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 30, "fedora-Server-dvd-iso-aarch64-*-aarch64": 30,
"fedora-universal-ppc64le-*-ppc64le": 30, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
"fedora-universal-x86_64-*-64bit": 30 "fedora-Server-dvd-iso-x86_64-*-64bit": 30
}, },
"settings": { "settings": {
"GRUB": "inst.ks=hd:vdb1:/root-user-crypted-net.ks", "GRUB": "inst.ks=hd:vdb1:/root-user-crypted-net.ks",
@ -1144,9 +1144,9 @@
}, },
"install_kickstart_nfs": { "install_kickstart_nfs": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 30, "fedora-Server-dvd-iso-aarch64-*-aarch64": 30,
"fedora-universal-ppc64le-*-ppc64le": 30, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
"fedora-universal-x86_64-*-64bit": 30 "fedora-Server-dvd-iso-x86_64-*-64bit": 30
}, },
"settings": { "settings": {
"GRUB": "inst.ks=nfs:172.16.2.110:/export/root-user-crypted-net.ks", "GRUB": "inst.ks=nfs:172.16.2.110:/export/root-user-crypted-net.ks",
@ -1161,9 +1161,9 @@
}, },
"install_kickstart_user_creation": { "install_kickstart_user_creation": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 20, "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
"fedora-universal-ppc64le-*-ppc64le": 20, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
"fedora-universal-x86_64-*-64bit": 20 "fedora-Server-dvd-iso-x86_64-*-64bit": 20
}, },
"settings": { "settings": {
"GRUB": "inst.ks=http://jskladan.fedorapeople.org/kickstarts/root-user-crypted-net.ks", "GRUB": "inst.ks=http://jskladan.fedorapeople.org/kickstarts/root-user-crypted-net.ks",
@ -1175,10 +1175,10 @@
}, },
"install_lvmthin": { "install_lvmthin": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 40, "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
"fedora-universal-ppc64le-*-ppc64le": 40, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
"fedora-universal-x86_64-*-64bit": 40, "fedora-Server-dvd-iso-x86_64-*-64bit": 40,
"fedora-universal-x86_64-*-uefi": 41 "fedora-Server-dvd-iso-x86_64-*-uefi": 41
}, },
"settings": { "settings": {
"PARTITIONING": "custom_lvmthin", "PARTITIONING": "custom_lvmthin",
@ -1187,9 +1187,9 @@
}, },
"install_mirrorlist_graphical": { "install_mirrorlist_graphical": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 20, "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
"fedora-universal-ppc64le-*-ppc64le": 20, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
"fedora-universal-x86_64-*-64bit": 20 "fedora-Server-dvd-iso-x86_64-*-64bit": 20
}, },
"settings": { "settings": {
"MIRRORLIST_GRAPHICAL": "1" "MIRRORLIST_GRAPHICAL": "1"
@ -1197,10 +1197,10 @@
}, },
"install_multi": { "install_multi": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 20, "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
"fedora-universal-ppc64le-*-ppc64le": 20, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
"fedora-universal-x86_64-*-64bit": 20, "fedora-Server-dvd-iso-x86_64-*-64bit": 20,
"fedora-universal-x86_64-*-uefi": 21 "fedora-Server-dvd-iso-x86_64-*-uefi": 21
}, },
"settings": { "settings": {
"HDD_2": "disk_full_mbr.img", "HDD_2": "disk_full_mbr.img",
@ -1211,10 +1211,10 @@
}, },
"install_multi_empty": { "install_multi_empty": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 30, "fedora-Server-dvd-iso-aarch64-*-aarch64": 30,
"fedora-universal-ppc64le-*-ppc64le": 30, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
"fedora-universal-x86_64-*-64bit": 30, "fedora-Server-dvd-iso-x86_64-*-64bit": 30,
"fedora-universal-x86_64-*-uefi": 31 "fedora-Server-dvd-iso-x86_64-*-uefi": 31
}, },
"settings": { "settings": {
"NUMDISKS": "2", "NUMDISKS": "2",
@ -1224,10 +1224,10 @@
}, },
"install_with_swap": { "install_with_swap": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 50, "fedora-Server-dvd-iso-aarch64-*-aarch64": 50,
"fedora-universal-ppc64le-*-ppc64le": 50, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 50,
"fedora-universal-x86_64-*-64bit": 50, "fedora-Server-dvd-iso-x86_64-*-64bit": 50,
"fedora-universal-x86_64-*-uefi": 51 "fedora-Server-dvd-iso-x86_64-*-uefi": 51
}, },
"settings": { "settings": {
"PARTITIONING": "custom_with_swap", "PARTITIONING": "custom_with_swap",
@ -1244,8 +1244,8 @@
}, },
"install_package_set_kde": { "install_package_set_kde": {
"profiles": { "profiles": {
"fedora-universal-ppc64le-*-ppc64le": 30, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
"fedora-universal-x86_64-*-64bit": 50 "fedora-Server-dvd-iso-x86_64-*-64bit": 50
}, },
"settings": { "settings": {
"DESKTOP": "kde", "DESKTOP": "kde",
@ -1257,9 +1257,9 @@
}, },
"install_package_set_minimal": { "install_package_set_minimal": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 30, "fedora-Server-dvd-iso-aarch64-*-aarch64": 30,
"fedora-universal-ppc64le-*-ppc64le": 30, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
"fedora-universal-x86_64-*-64bit": 30 "fedora-Server-dvd-iso-x86_64-*-64bit": 30
}, },
"settings": { "settings": {
"PACKAGE_SET": "minimal", "PACKAGE_SET": "minimal",
@ -1268,10 +1268,10 @@
}, },
"install_pxeboot": { "install_pxeboot": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 30, "fedora-Server-dvd-iso-aarch64-*-aarch64": 30,
"fedora-universal-ppc64le-*-ppc64le": 30, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
"fedora-universal-x86_64-*-64bit": 30, "fedora-Server-dvd-iso-x86_64-*-64bit": 30,
"fedora-universal-x86_64-*-uefi": 31 "fedora-Server-dvd-iso-x86_64-*-uefi": 31
}, },
"settings": { "settings": {
"+ISO": "", "+ISO": "",
@ -1301,9 +1301,9 @@
}, },
"install_repository_http_graphical": { "install_repository_http_graphical": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 20, "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
"fedora-universal-ppc64le-*-ppc64le": 20, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
"fedora-universal-x86_64-*-64bit": 20 "fedora-Server-dvd-iso-x86_64-*-64bit": 20
}, },
"settings": { "settings": {
"REPOSITORY_GRAPHICAL": "%LOCATION%" "REPOSITORY_GRAPHICAL": "%LOCATION%"
@ -1311,9 +1311,9 @@
}, },
"install_repository_http_variation": { "install_repository_http_variation": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 20, "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
"fedora-universal-ppc64le-*-ppc64le": 20, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
"fedora-universal-x86_64-*-64bit": 20 "fedora-Server-dvd-iso-x86_64-*-64bit": 20
}, },
"settings": { "settings": {
"REPOSITORY_VARIATION": "%LOCATION%" "REPOSITORY_VARIATION": "%LOCATION%"
@ -1363,10 +1363,10 @@
}, },
"install_rescue_encrypted": { "install_rescue_encrypted": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 31, "fedora-Server-dvd-iso-aarch64-*-aarch64": 31,
"fedora-universal-ppc64le-*-ppc64le": 31, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 31,
"fedora-universal-x86_64-*-64bit": 31, "fedora-Server-dvd-iso-x86_64-*-64bit": 31,
"fedora-universal-x86_64-*-uefi": 32 "fedora-Server-dvd-iso-x86_64-*-uefi": 32
}, },
"settings": { "settings": {
"BOOTFROM": "d", "BOOTFROM": "d",
@ -1377,8 +1377,8 @@
}, },
"install_sata": { "install_sata": {
"profiles": { "profiles": {
"fedora-universal-x86_64-*-64bit": 20, "fedora-Server-dvd-iso-x86_64-*-64bit": 20,
"fedora-universal-x86_64-*-uefi": 21 "fedora-Server-dvd-iso-x86_64-*-uefi": 21
}, },
"settings": { "settings": {
"ATACONTROLLER": "ich9-ahci", "ATACONTROLLER": "ich9-ahci",
@ -1387,9 +1387,9 @@
}, },
"install_scsi_updates_img": { "install_scsi_updates_img": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 20, "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
"fedora-universal-ppc64le-*-ppc64le": 20, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
"fedora-universal-x86_64-*-64bit": 20 "fedora-Server-dvd-iso-x86_64-*-64bit": 20
}, },
"settings": { "settings": {
"CDMODEL": "scsi-cd", "CDMODEL": "scsi-cd",
@ -1401,9 +1401,9 @@
}, },
"install_serial_console": { "install_serial_console": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 30, "fedora-Server-dvd-iso-aarch64-*-aarch64": 30,
"fedora-universal-ppc64le-*-ppc64le": 30, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
"fedora-universal-x86_64-*-64bit": 30 "fedora-Server-dvd-iso-x86_64-*-64bit": 30
}, },
"settings": { "settings": {
"ANACONDA_TEXT": "1", "ANACONDA_TEXT": "1",
@ -1414,9 +1414,9 @@
}, },
"install_shrink_ext4": { "install_shrink_ext4": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 40, "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
"fedora-universal-ppc64le-*-ppc64le": 40, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
"fedora-universal-x86_64-*-64bit": 40 "fedora-Server-dvd-iso-x86_64-*-64bit": 40
}, },
"settings": { "settings": {
"HDD_1": "disk_shrink_ext4.img", "HDD_1": "disk_shrink_ext4.img",
@ -1426,9 +1426,9 @@
}, },
"install_shrink_ntfs": { "install_shrink_ntfs": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 40, "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
"fedora-universal-ppc64le-*-ppc64le": 40, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
"fedora-universal-x86_64-*-64bit": 40 "fedora-Server-dvd-iso-x86_64-*-64bit": 40
}, },
"settings": { "settings": {
"HDD_1": "disk_shrink_ntfs.img", "HDD_1": "disk_shrink_ntfs.img",
@ -1438,10 +1438,10 @@
}, },
"install_simple_encrypted": { "install_simple_encrypted": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 30, "fedora-Server-dvd-iso-aarch64-*-aarch64": 30,
"fedora-universal-ppc64le-*-ppc64le": 30, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
"fedora-universal-x86_64-*-64bit": 30, "fedora-Server-dvd-iso-x86_64-*-64bit": 30,
"fedora-universal-x86_64-*-uefi": 31 "fedora-Server-dvd-iso-x86_64-*-uefi": 31
}, },
"settings": { "settings": {
"ENCRYPT_PASSWORD": "weakpassword", "ENCRYPT_PASSWORD": "weakpassword",
@ -1450,10 +1450,10 @@
}, },
"install_simple_free_space": { "install_simple_free_space": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 30, "fedora-Server-dvd-iso-aarch64-*-aarch64": 30,
"fedora-universal-ppc64le-*-ppc64le": 30, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
"fedora-universal-x86_64-*-64bit": 30, "fedora-Server-dvd-iso-x86_64-*-64bit": 30,
"fedora-universal-x86_64-*-uefi": 31 "fedora-Server-dvd-iso-x86_64-*-uefi": 31
}, },
"settings": { "settings": {
"HDD_1": "disk_freespace_%PART_TABLE_TYPE%.img", "HDD_1": "disk_freespace_%PART_TABLE_TYPE%.img",
@ -1463,10 +1463,10 @@
}, },
"install_software_raid": { "install_software_raid": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 30, "fedora-Server-dvd-iso-aarch64-*-aarch64": 30,
"fedora-universal-ppc64le-*-ppc64le": 30, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
"fedora-universal-x86_64-*-64bit": 30, "fedora-Server-dvd-iso-x86_64-*-64bit": 30,
"fedora-universal-x86_64-*-uefi": 31 "fedora-Server-dvd-iso-x86_64-*-uefi": 31
}, },
"settings": { "settings": {
"NUMDISKS": "2", "NUMDISKS": "2",
@ -1476,8 +1476,8 @@
}, },
"install_updates_img_local": { "install_updates_img_local": {
"profiles": { "profiles": {
"fedora-universal-ppc64le-*-ppc64le": 30, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
"fedora-universal-x86_64-*-64bit": 40 "fedora-Server-dvd-iso-x86_64-*-64bit": 40
}, },
"settings": { "settings": {
"GRUB": "inst.updates=hd:LABEL=UPDATES_IMG:/updates.img", "GRUB": "inst.updates=hd:LABEL=UPDATES_IMG:/updates.img",
@ -1567,10 +1567,10 @@
}, },
"install_xfs": { "install_xfs": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 40, "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
"fedora-universal-ppc64le-*-ppc64le": 40, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
"fedora-universal-x86_64-*-64bit": 40, "fedora-Server-dvd-iso-x86_64-*-64bit": 40,
"fedora-universal-x86_64-*-uefi": 41 "fedora-Server-dvd-iso-x86_64-*-uefi": 41
}, },
"settings": { "settings": {
"PARTITIONING": "custom_xfs", "PARTITIONING": "custom_xfs",
@ -2079,10 +2079,7 @@
"profiles": { "profiles": {
"fedora-Server-dvd-iso-aarch64-*-aarch64": 10, "fedora-Server-dvd-iso-aarch64-*-aarch64": 10,
"fedora-Server-dvd-iso-ppc64le-*-ppc64le": 10, "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 10,
"fedora-Server-dvd-iso-x86_64-*-64bit": 10, "fedora-Server-dvd-iso-x86_64-*-64bit": 10
"fedora-universal-aarch64-*-aarch64": 10,
"fedora-universal-ppc64le-*-ppc64le": 10,
"fedora-universal-x86_64-*-64bit": 10
}, },
"settings": { "settings": {
"BOOTFROM": "c", "BOOTFROM": "c",
@ -2107,7 +2104,6 @@
"DESKTOP": "gnome", "DESKTOP": "gnome",
"HDD_1": "disk_f%UP2REL%_desktop_4_x86_64.img", "HDD_1": "disk_f%UP2REL%_desktop_4_x86_64.img",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"TEST_TARGET": "COMPOSE",
"UPGRADE": "1", "UPGRADE": "1",
"USER_LOGIN": "test", "USER_LOGIN": "test",
"USER_PASSWORD": "weakpassword" "USER_PASSWORD": "weakpassword"
@ -2123,7 +2119,6 @@
"ENCRYPT_PASSWORD": "weakpassword", "ENCRYPT_PASSWORD": "weakpassword",
"HDD_1": "disk_f%UP2REL%_desktopencrypt_x86_64.img", "HDD_1": "disk_f%UP2REL%_desktopencrypt_x86_64.img",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"TEST_TARGET": "COMPOSE",
"UPGRADE": "1", "UPGRADE": "1",
"USER_LOGIN": "test", "USER_LOGIN": "test",
"USER_PASSWORD": "weakpassword" "USER_PASSWORD": "weakpassword"
@ -2138,7 +2133,6 @@
"DESKTOP": "kde", "DESKTOP": "kde",
"HDD_1": "disk_f%UP2REL%_kde_4_x86_64.img", "HDD_1": "disk_f%UP2REL%_kde_4_x86_64.img",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"TEST_TARGET": "COMPOSE",
"UPGRADE": "1", "UPGRADE": "1",
"USER_LOGIN": "test", "USER_LOGIN": "test",
"USER_PASSWORD": "weakpassword" "USER_PASSWORD": "weakpassword"
@ -2154,7 +2148,6 @@
"BOOTFROM": "c", "BOOTFROM": "c",
"HDD_1": "disk_f%UP2REL%_minimal_3_%ARCH%.img", "HDD_1": "disk_f%UP2REL%_minimal_3_%ARCH%.img",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"TEST_TARGET": "COMPOSE",
"UPGRADE": "1", "UPGRADE": "1",
"USER_LOGIN": "false" "USER_LOGIN": "false"
} }
@ -2167,7 +2160,6 @@
"BOOTFROM": "c", "BOOTFROM": "c",
"HDD_1": "disk_f%UP2REL%_minimal-uefi_3_%ARCH%.img", "HDD_1": "disk_f%UP2REL%_minimal-uefi_3_%ARCH%.img",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"TEST_TARGET": "COMPOSE",
"UPGRADE": "1", "UPGRADE": "1",
"USER_LOGIN": "false" "USER_LOGIN": "false"
} }
@ -2186,7 +2178,6 @@
"POST_STATIC": "172.16.2.103 client003.domain.local", "POST_STATIC": "172.16.2.103 client003.domain.local",
"PREUPGRADE": "realmd_join_sssd", "PREUPGRADE": "realmd_join_sssd",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"TEST_TARGET": "COMPOSE",
"UPGRADE": "1", "UPGRADE": "1",
"USER_LOGIN": "false", "USER_LOGIN": "false",
"WORKER_CLASS": "tap" "WORKER_CLASS": "tap"
@ -2202,7 +2193,6 @@
"BOOTFROM": "c", "BOOTFROM": "c",
"HDD_1": "disk_f%UP2REL%_server_3_%ARCH%.img", "HDD_1": "disk_f%UP2REL%_server_3_%ARCH%.img",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"TEST_TARGET": "COMPOSE",
"UPGRADE": "1", "UPGRADE": "1",
"USER_LOGIN": "test", "USER_LOGIN": "test",
"USER_PASSWORD": "weakpassword" "USER_PASSWORD": "weakpassword"
@ -2222,7 +2212,6 @@
"POST_STATIC": "172.16.2.100 ipa001.domain.local", "POST_STATIC": "172.16.2.100 ipa001.domain.local",
"PREUPGRADE": "role_deploy_domain_controller", "PREUPGRADE": "role_deploy_domain_controller",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"TEST_TARGET": "COMPOSE",
"UPGRADE": "1", "UPGRADE": "1",
"USER_LOGIN": "false", "USER_LOGIN": "false",
"WORKER_CLASS": "tap" "WORKER_CLASS": "tap"
@ -2237,7 +2226,6 @@
"DESKTOP": "gnome", "DESKTOP": "gnome",
"HDD_1": "disk_f%UP1REL%_desktop_4_x86_64.img", "HDD_1": "disk_f%UP1REL%_desktop_4_x86_64.img",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"TEST_TARGET": "COMPOSE",
"UPGRADE": "1", "UPGRADE": "1",
"USER_LOGIN": "test", "USER_LOGIN": "test",
"USER_PASSWORD": "weakpassword" "USER_PASSWORD": "weakpassword"
@ -2253,7 +2241,6 @@
"ENCRYPT_PASSWORD": "weakpassword", "ENCRYPT_PASSWORD": "weakpassword",
"HDD_1": "disk_f%UP1REL%_desktopencrypt_x86_64.img", "HDD_1": "disk_f%UP1REL%_desktopencrypt_x86_64.img",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"TEST_TARGET": "COMPOSE",
"UPGRADE": "1", "UPGRADE": "1",
"USER_LOGIN": "test", "USER_LOGIN": "test",
"USER_PASSWORD": "weakpassword" "USER_PASSWORD": "weakpassword"
@ -2268,7 +2255,6 @@
"BOOTFROM": "c", "BOOTFROM": "c",
"DESKTOP": "kde", "DESKTOP": "kde",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"TEST_TARGET": "COMPOSE",
"UPGRADE": "1", "UPGRADE": "1",
"USER_LOGIN": "test", "USER_LOGIN": "test",
"USER_PASSWORD": "weakpassword" "USER_PASSWORD": "weakpassword"
@ -2284,7 +2270,6 @@
"BOOTFROM": "c", "BOOTFROM": "c",
"HDD_1": "disk_f%UP1REL%_minimal_3_%ARCH%.img", "HDD_1": "disk_f%UP1REL%_minimal_3_%ARCH%.img",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"TEST_TARGET": "COMPOSE",
"UPGRADE": "1", "UPGRADE": "1",
"USER_LOGIN": "false" "USER_LOGIN": "false"
} }
@ -2297,7 +2282,6 @@
"BOOTFROM": "c", "BOOTFROM": "c",
"HDD_1": "disk_f%UP1REL%_minimal-uefi_3_%ARCH%.img", "HDD_1": "disk_f%UP1REL%_minimal-uefi_3_%ARCH%.img",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"TEST_TARGET": "COMPOSE",
"UPGRADE": "1", "UPGRADE": "1",
"USER_LOGIN": "false" "USER_LOGIN": "false"
} }
@ -2317,7 +2301,6 @@
"POST_STATIC": "172.16.2.103 client003.domain.local", "POST_STATIC": "172.16.2.103 client003.domain.local",
"PREUPGRADE": "realmd_join_sssd", "PREUPGRADE": "realmd_join_sssd",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"TEST_TARGET": "COMPOSE",
"UPGRADE": "1", "UPGRADE": "1",
"USER_LOGIN": "false", "USER_LOGIN": "false",
"WORKER_CLASS": "tap" "WORKER_CLASS": "tap"
@ -2333,7 +2316,6 @@
"BOOTFROM": "c", "BOOTFROM": "c",
"HDD_1": "disk_f%UP1REL%_server_3_%ARCH%.img", "HDD_1": "disk_f%UP1REL%_server_3_%ARCH%.img",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"TEST_TARGET": "COMPOSE",
"UPGRADE": "1", "UPGRADE": "1",
"USER_LOGIN": "test", "USER_LOGIN": "test",
"USER_PASSWORD": "weakpassword" "USER_PASSWORD": "weakpassword"
@ -2354,7 +2336,6 @@
"POST_STATIC": "172.16.2.100 ipa001.domain.local", "POST_STATIC": "172.16.2.100 ipa001.domain.local",
"PREUPGRADE": "role_deploy_domain_controller", "PREUPGRADE": "role_deploy_domain_controller",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"TEST_TARGET": "COMPOSE",
"UPGRADE": "1", "UPGRADE": "1",
"USER_LOGIN": "false", "USER_LOGIN": "false",
"WORKER_CLASS": "tap" "WORKER_CLASS": "tap"