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

Move most 'universal' tests to Server-dvd-iso

Browse Source 
The 'universal' flavor has been kinda pointless for some time
now. It dates back to the earliest days of openQA, before Pungi
4 was a thing, when composes were very different; we only built
a boot.iso and some live images nightly for Rawhide, these
weren't even formally grouped as a 'compose' at all (fedfind had
to invent the concept). The TCs/RCs had DVD installer images
(not *Server* DVD, at the time, just a universal DVD installer).
We wanted to run some tests on the DVD image if it was available,
but we still wanted to run them for the nightlies, so we invented
a whole mechanism for that - this 'universal' flavor, with some
complicated logic in fedora_openqa which schedules universal on
the 'best available' image it can find in the compose.

All this is functionally obsolete now. All composes we test are
now run through Pungi (except the live respins, but they aren't
relevant here). In current config, the Server DVD is non-failable
on x86_64 and aarch64, which means it will *always be there* -
if it fails to build, the compose itself fails, so we won't test
it. It's failable for ppc64le, but we don't care that much about
ppc64le; I'm fine with these tests just not running if the Server
DVD happens to fail in a ppc64le compose.

As a cherry on top, some of the 'universal' tests aren't really
universal anyway, they fail if you run them on a netinst (off
the top of my head, all the NFS install tests are like this, as
we use the ISO to populate the NFS share on the server end).

So let's just move all the tests that actually need an installer
image to the Server-dvd-iso flavor. Left over in the 'universal'
flavor are upgrade tests, which don't need an ISO at all - they
boot from hard disk images and run an upgrade using repos. We
can change the scheduler logic to be more simple for these, and
just always schedule them, with no ISO attached. We could even
rename this flavor 'upgrade', but it might not be worth it.

One slight complication is that the split happened to be helping
us avoid too many tests in a single support_server cluster; we
have a cluster of five support_server tests on Server-dvd-iso
and five support_server tests on universal. I try to avoid the
clusters getting too big as you need as many worker instances on
at least one worker host as your largest cluster; if you don't
have that many, the cluster's tests simply never get scheduled.
Requiring folks to have at least ten worker instances on one
host to run these tests is a bit of a big ask. So, to handle
that, we create a support_server_2 and have the former universal
tests use that one instead, so we'll have two separate clusters
on Server-dvd-iso now.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2023-05-03 13:45:52 -07:00
parent 0c633e132c
commit 5cab5ec565
3 changed files with 177 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

307
templates.fif.json
View File

@ -1244,9 +1244,9 @@
}, },
"install_addrepo_metalink_graphical": { "install_addrepo_metalink_graphical": {
"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
}, },
"settings": { "settings": {
"ADD_REPOSITORY_GRAPHICAL": "ml:https://fedorapeople.org/groups/qa/openqa-repos/openqa-testrepo-2.xml", "ADD_REPOSITORY_GRAPHICAL": "ml:https://fedorapeople.org/groups/qa/openqa-repos/openqa-testrepo-2.xml",
@ -1255,9 +1255,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"
@ -1276,9 +1276,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",
@ -1309,9 +1309,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",
@ -1329,10 +1329,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",
@ -1342,10 +1342,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",
@ -1404,10 +1404,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",
@ -1417,10 +1417,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",
@ -1431,10 +1431,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",
@ -1444,10 +1444,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",
@ -1481,9 +1481,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",
@ -1540,10 +1540,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",
@ -1553,8 +1553,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",
@ -1564,9 +1564,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",
@ -1584,15 +1584,15 @@
}, },
"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",
"INSTALL_UNLOCK": "support_ready", "INSTALL_UNLOCK": "support_ready",
"NICTYPE": "tap", "NICTYPE": "tap",
"PARALLEL_WITH": "support_server", "PARALLEL_WITH": "support_server_2",
"PARTITIONING": "custom_iscsi", "PARTITIONING": "custom_iscsi",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"WORKER_CLASS": "tap" "WORKER_CLASS": "tap"
@ -1600,9 +1600,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",
@ -1614,9 +1614,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",
@ -1628,9 +1628,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",
@ -1644,16 +1644,16 @@
}, },
"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.120:/export/root-user-crypted-net.ks",
"INSTALL_UNLOCK": "support_ready", "INSTALL_UNLOCK": "support_ready",
"KICKSTART": "1", "KICKSTART": "1",
"NICTYPE": "tap", "NICTYPE": "tap",
"PARALLEL_WITH": "support_server", "PARALLEL_WITH": "support_server_2",
"ROOT_PASSWORD": "111111", "ROOT_PASSWORD": "111111",
"USER_LOGIN": "false", "USER_LOGIN": "false",
"WORKER_CLASS": "tap" "WORKER_CLASS": "tap"
@ -1661,9 +1661,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=https://fedorapeople.org/groups/qa/kickstarts/root-user-crypted-net.ks", "GRUB": "inst.ks=https://fedorapeople.org/groups/qa/kickstarts/root-user-crypted-net.ks",
@ -1675,10 +1675,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",
@ -1713,9 +1713,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"
@ -1723,10 +1723,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",
@ -1737,10 +1737,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",
@ -1750,10 +1750,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",
@ -1770,8 +1770,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",
@ -1783,9 +1783,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",
@ -1794,17 +1794,17 @@
}, },
"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": "",
"DELAYED_START": "1", "DELAYED_START": "1",
"KICKSTART": "1", "KICKSTART": "1",
"NICTYPE": "tap", "NICTYPE": "tap",
"PARALLEL_WITH": "support_server@%ARCH_BASE_MACHINE%", "PARALLEL_WITH": "support_server_2@%ARCH_BASE_MACHINE%",
"PXEBOOT": "once", "PXEBOOT": "once",
"ROOT_PASSWORD": "111111", "ROOT_PASSWORD": "111111",
"TEST_TARGET": "COMPOSE", "TEST_TARGET": "COMPOSE",
@ -1827,9 +1827,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%"
@ -1837,9 +1837,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%"
@ -1889,10 +1889,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",
@ -1903,8 +1903,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",
@ -1913,9 +1913,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",
@ -1927,9 +1927,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",
@ -1940,9 +1940,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",
@ -1952,9 +1952,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",
@ -1964,10 +1964,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",
@ -1976,10 +1976,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",
@ -1989,10 +1989,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",
@ -2002,8 +2002,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",
@ -2093,10 +2093,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",
@ -2615,10 +2615,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",
@ -2634,6 +2631,28 @@
"WORKER_CLASS": "tap" "WORKER_CLASS": "tap"
} }
}, },
"support_server_2": {
"profiles": {
"fedora-Server-dvd-iso-aarch64-*-aarch64": 10,
"fedora-Server-dvd-iso-ppc64le-*-ppc64le": 10,
"fedora-Server-dvd-iso-x86_64-*-64bit": 10
},
"settings": {
"BOOTFROM": "c",
"HDD_1": "disk_f%CURRREL%_support_5_%ARCH%.qcow2",
"NICTYPE": "tap",
"NUMDISKS": "2",
"PARALLEL_CANCEL_WHOLE_CLUSTER": "0",
"POSTINSTALL": "_support_server",
"POST_STATIC": "172.16.2.120 support2.test.openqa.fedoraproject.org",
"ROOT_PASSWORD": "weakpassword",
"SUPPORT_PXE": "1",
"SUPPORT_ISCSI": "1",
"TEST_TARGET": "NONE",
"USER_LOGIN": "false",
"WORKER_CLASS": "tap"
}
},
"unwanted_packages": { "unwanted_packages": {
"profiles": { "profiles": {
"fedora-Workstation-live-iso-ppc64le-*-ppc64le": 50, "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 50,

21
tests/_support_server.pm
View File

@ -78,11 +78,14 @@ sub _pxe_setup {
$kernpath = "ppc/ppc64" if ($arch eq 'ppc64le'); $kernpath = "ppc/ppc64" if ($arch eq 'ppc64le');
assert_script_run "curl -o /var/lib/tftpboot/fedora/vmlinuz $location/Everything/${arch}/os/${kernpath}/vmlinuz"; assert_script_run "curl -o /var/lib/tftpboot/fedora/vmlinuz $location/Everything/${arch}/os/${kernpath}/vmlinuz";
assert_script_run "curl -o /var/lib/tftpboot/fedora/initrd.img $location/Everything/${arch}/os/${kernpath}/initrd.img"; assert_script_run "curl -o /var/lib/tftpboot/fedora/initrd.img $location/Everything/${arch}/os/${kernpath}/initrd.img";
# extract our IP from POST_STATIC
my $poststatic = get_var("POST_STATIC");
my $ip = substr($poststatic, 0, index($poststatic, " "));
# get a kickstart to embed in the initramfs, for testing: # get a kickstart to embed in the initramfs, for testing:
# https://fedoraproject.org/wiki/QA:Testcase_Kickstart_File_Path_Ks_Cfg # https://fedoraproject.org/wiki/QA:Testcase_Kickstart_File_Path_Ks_Cfg
assert_script_run "curl -o ks.cfg https://fedorapeople.org/groups/qa/kickstarts/root-user-crypted-net.ks"; assert_script_run "curl -o ks.cfg https://fedorapeople.org/groups/qa/kickstarts/root-user-crypted-net.ks";
# tweak the repo config in it # tweak the repo config in it
assert_script_run "sed -i -e 's,^url.*,nfs --server 172.16.2.110 --dir /repo --opts nfsvers=4,g' ks.cfg"; assert_script_run "sed -i -e 's,^url.*,nfs --server $ip --dir /repo --opts nfsvers=4,g' ks.cfg";
# embed it # embed it
assert_script_run "echo ks.cfg | cpio -c -o >> /var/lib/tftpboot/fedora/initrd.img"; assert_script_run "echo ks.cfg | cpio -c -o >> /var/lib/tftpboot/fedora/initrd.img";
# chown root # chown root
@ -105,7 +108,7 @@ sub run {
# create config # create config
assert_script_run "printf 'domain=test.openqa.fedoraproject.org\ndhcp-range=172.16.2.150,172.16.2.199\ndhcp-option=option:router,172.16.2.2\n' > /etc/dnsmasq.conf"; assert_script_run "printf 'domain=test.openqa.fedoraproject.org\ndhcp-range=172.16.2.150,172.16.2.199\ndhcp-option=option:router,172.16.2.2\n' > /etc/dnsmasq.conf";
# do PXE setup if this is not an update test # do PXE setup if this is not an update test
_pxe_setup() unless (get_var("ADVISORY_OR_TASK")); _pxe_setup() if (get_var("SUPPORT_PXE"));
# open firewall ports # open firewall ports
assert_script_run "firewall-cmd --add-service=dhcp"; assert_script_run "firewall-cmd --add-service=dhcp";
assert_script_run "firewall-cmd --add-service=dns"; assert_script_run "firewall-cmd --add-service=dns";
@ -115,12 +118,14 @@ sub run {
## ISCSI ## ISCSI
# start up iscsi target if (get_var("SUPPORT_ISCSI")) {
assert_script_run "printf '<target iqn.2016-06.local.domain:support.target1>\n backing-store /dev/vdb\n incominguser test weakpassword\n</target>' > /etc/tgt/conf.d/openqa.conf"; # start up iscsi target
# open firewall port assert_script_run "printf '<target iqn.2016-06.local.domain:support.target1>\n backing-store /dev/vdb\n incominguser test weakpassword\n</target>' > /etc/tgt/conf.d/openqa.conf";
assert_script_run "firewall-cmd --add-service=iscsi-target"; # open firewall port
assert_script_run "systemctl restart tgtd.service"; assert_script_run "firewall-cmd --add-service=iscsi-target";
assert_script_run "systemctl is-active tgtd.service"; assert_script_run "systemctl restart tgtd.service";
assert_script_run "systemctl is-active tgtd.service";
}
## NFS ## NFS

2
tests/disk_custom_iscsi.pm
View File

@ -7,7 +7,7 @@ sub run {
my $self = shift; my $self = shift;
# iscsi config hash # iscsi config hash
my %iscsi; my %iscsi;
$iscsi{'iqn.2016-06.local.domain:support.target1'} = ['172.16.2.110', 'test', 'weakpassword']; $iscsi{'iqn.2016-06.local.domain:support.target1'} = ['172.16.2.120', 'test', 'weakpassword'];
# Anaconda hub # Anaconda hub
# Go to INSTALLATION DESTINATION and ensure one regular disk # Go to INSTALLATION DESTINATION and ensure one regular disk
# and the iscsi target are selected. # and the iscsi target are selected.